[nb] Commit

flake.lock

@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1703013332,
-        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
+        "lastModified": 1705677747,
+        "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
+        "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
         "type": "github"
       },
       "original": {

home-manager/dots/bash.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, config, user, ... }:
 {
   home.file = {
     ".bash_login" = {
@@ -31,6 +31,12 @@
         alias mkfoo='. $HOME/.local/bin/mkfoo.sh'
         alias ed='ed -p "> "'
         # Functions
+        function get-ssh() {
+            if [ ! -f $HOME/.ssh/id_ed25519.pub ]; then
+                ssh-keygen -t ed25519 -C "${user.email}"
+            fi
+            cat $HOME/.ssh/id_ed25519.pub
+        }
         function home() {
         	cd
         	clear

home-manager/dots/river.nix

@@ -157,7 +157,7 @@
         # Global Configuration Settings
         riverctl default-layout rivertile
         rivertile -view-padding 10 -outer-padding 10 &
-        riverctl attach-mode top
+        riverctl attach-mode bottom
         riverctl hide-cursor timeout 10000
         riverctl hide-cursor when-typing enabled
         riverctl set-cursor-warp on-focus-change

hosts/buckwheat/configuration.nix

@@ -72,7 +72,10 @@ in
       };
     };
   };
-  programs.virt-manager.enable = true;
+  programs = {
+    virt-manager.enable = true;
+    river.enable = true;
+  };
   users.users.${user.name} = {
     extraGroups = [ "davfs2" "libvirtd" "transmission" ];
     packages = with pkgs; [

hosts/buckwheat/home.nix

@@ -1,24 +1,6 @@
 # Buckwheat home.nix
 { config, lib, pkgs, inputs, user, ... }:
 {
-  xsession.windowManager.bspwm = {
-    monitors = {
-      DP-1 = [
-        "1"
-        "2"
-        "3"
-        "4"
-        "5"
-      ];
-      DP-2 = [
-        "6"
-        "7"
-        "8"
-        "9"
-        "0"
-      ];
-    };
-  };
   services = {
     udiskie = {
       enable = true;

hosts/buckwheat/xorg.nix

@@ -0,0 +1,22 @@
+# Buckwheat home.nix
+{ config, lib, pkgs, inputs, user, ... }:
+{
+  xsession.windowManager.bspwm = {
+    monitors = {
+      DP-1 = [
+        "1"
+        "2"
+        "3"
+        "4"
+        "5"
+      ];
+      DP-2 = [
+        "6"
+        "7"
+        "8"
+        "9"
+        "0"
+      ];
+    };
+  };
+}

hosts/default.nix

@@ -27,9 +27,9 @@
     inherit system;
     specialArgs = { inherit user inputs; };
     modules = [ 
-      ../nixos/xorg.nix
-      ../nixos/office.nix
-      ../nixos/pentest.nix
+      ../nixos/wayland.nix
+      ../nixos/collections/office.nix
+      ../nixos/collections/pentest.nix
       ./fireweed/configuration.nix
       home-manager.nixosModules.home-manager {
         home-manager.useGlobalPkgs = true;
@@ -37,7 +37,7 @@
         home-manager.extraSpecialArgs = { inherit user; };
         home-manager.users.${user.name} = {
           imports = [
-            ../home-manager/xorg.nix
+            ../home-manager/wayland.nix
             ./fireweed/home.nix
           ];
         };

hosts/fireweed/configuration.nix

@@ -32,11 +32,6 @@ in
       allowedTCPPorts = [ 445 139 ];
       allowedUDPPorts = [ 137 138 ];
     };
-    # Proxy configuration
-    # proxy = {
-    #   default = "http://user:password@proxy:port/";
-    #   noProxy = "127.0.0.1,localhost,internal.domain";
-    # };
   };
   users.users.${user.name} = {
     extraGroups = [ "davfs2" ];
@@ -51,11 +46,11 @@ in
       enable = true;
       package = pkgs.mullvad-vpn;
     };
-    udisks2 = {
+    cage = {
       enable = true;
-      mountOnMedia = true;
+      program = "${pkgs.foot}/bin/foot";
+      user = "${user.name}";
     };
-    # Enable automatic login for the user.
-    # getty.autologinUser = "${user.name}";
   };
+  getty.autologinUser = "${user.name}";
 }

nixos/base.nix

@@ -69,8 +69,8 @@
     extraGroups = [ "networkmanager" "wheel" ];
     initialPassword = "hunter2";
     packages = with pkgs; [
+      bottom
       eva
-      gotop
       links2
       nix-du
       nmap

nixos/gui.nix

@@ -45,6 +45,7 @@
   users.users.${user.name}.packages = with pkgs; [
     ani-cli
     glib
+    gparted
     lagrange
     librewolf
     mangal

nixos/wayland.nix

@@ -22,46 +22,27 @@
       ];
     };
   };
-  services = {
-    cage = {
-      enable = true;
-      program = "${pkgs.foot}/bin/foot"
-      user = "${user.name}";
-    };
-  };
-  programs = {
-    river = {
-      enable = true;
-      extraPackages = with pkgs; [
-        bemenu
-        bemoji
-        cliphist
-        grim
-        foot
-        imv
-        kanshi
-        mako
-        pinentry-bemenu
-        slurp
-        swappy
-        swaylock
-        swww
-        tessen
-        waybar
-        wf-recorder
-        wl-clipboard
-        wtype
-      ];
-    };
-    wayfire = {
-      enable = true;
-      plugins = with pkgs.wayfirePlugins; [
-        wcm
-        wf-shell
-        wayfire-plugins-extra
-      ];
-    };
-    xwayland = {
+  environment.systemPackages = with pkgs; [
+    bemenu
+    bemoji
+    cliphist
+    grim
+    foot
+    imv
+    kanshi
+    mako
+    pinentry-bemenu
+    slurp
+    swappy
+    swaylock
+    swww
+    tessen
+    waybar
+    wf-recorder
+    wl-clipboard
+    wtype
+  ];
+  programs.xwayland = {
       enable = true;
     };
   };