A billion changes, but I'm finally on this new config!

hosts/nixos/common/global/default.nix

@@ -11,6 +11,10 @@
     ./wireless
   ];
 
+  age.identityPaths = [
+    "/etc/ssh/ssh_host_ed25519_key"
+  ];
+
   nixpkgs = {
     # Add all overlays defined in the overlays directory
     overlays = builtins.attrValues outputs.overlays ++ [

hosts/nixos/common/global/nix.nix

@@ -40,20 +40,6 @@
       # TODO: what is a trusted user?
       trusted-users = [ "root" "@wheel" ];
 
-      # {{{ Caching and whatnot
-      substituters = [
-        "https://cache.nixos.org" # Default nixos cache
-        "https://nix-community.cachix.org" # I think I need this for neovim-nightly?
-        "https://cm-idris2-pkgs.cachix.org" # Idris packages
-        "https://danth.cachix.org" # stylix
-      ];
-
-      trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "cm-idris2-pkgs.cachix.org-1:YB2oJSEsD5oMJjAESxolC2GQtE6B5I6jkWhte2gtXjk="
-        "danth.cachix.org-1:wpodfSL7suXRc/rJDZZUptMa1t4MJ795hemRN0q84vI="
-      ];
-      # }}}
     };
   };
 }

hosts/nixos/common/global/wireless/default.nix

@@ -19,19 +19,11 @@
       enable = true;
       group = "network";
     };
-
-    # TODO: look into what this does
-    extraConfig = ''
-      update_config=1
-    '';
   };
 
   # Ensure group exists
   users.groups.network = { };
 
-  # Convenient alias for connecting to wifi
-  environment.shellAliases.wifi = "sudo nmcli con up id";
-
   # Persist imperative config
   # environment.persistence = {
   #   "/persist".files = [

hosts/nixos/common/global/wireless/wifi_passwords.age

@@ -1,7 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 UUF9JQ Qc1AgNo+N/kjGhMVHa/QDPt5nRCtuC8BvNdxuwHHKRA
-ZnOW8dIH2Sd5WDlvVA27hpp5AVHieJXIpwCmtg+dcp0
--> rD3(ZZw-grease ZvlDZ7| G|:Xj NsbyfDh L\'
-hZeXb1QaqOPfJKTKYdB60pMyHt6G42sIEmfzNqRI/w
---- RFPqwBq0YPAoxa/g0gEmJmWTiYH6c77ZYR0snUIx0vE
-æÀµÞêS©_!…º™s¥_i?·><3E>ËÉry<0C>V‹|ŽÞ^­ò:…ó>¯ÍúLˉQÃ~æð€<19>3W®O9eÛ(•æ<ÈyŒC JòÇRqrù
+-> ssh-ed25519 UUF9JQ q9tidRTxf+4VeDopyrO7y970Qm94iwUPsQTVK+/YGjQ
+YvjmIkVFwkIUk7OhQ1MglvcNGgXna2SgRSfMJtfOAkE
+-> ssh-ed25519 qgVaDQ REcJWqJalQylWOSOVJT1jAJtQp6qnbztcyxo/2BDdE8
+nnbnzYKKE99thYzXzODD/rSQggJgOV5Cl8ZniDfCsGY
+-> L>-grease #efvc '0l?X`-h
+F5xodFT3Tp+VpLJvE2R5PVkb43tm4VfbvTKLVIW0AuZ/wZWIedDinZx9i+gfWUsk
+5U8rU6Ki3DdbOICZ
+--- Cwoa81XsipVdO0hj9QeV60dYjHwEoS9FoDRSQ8/56oQ
+èý£¯föÖ<EFBFBD>LoYs5ià¥L;”³ñÆ”=íú^.ôü»ŠÄ§˜Ö
‘~·ˆu»9ÅZ‘ΤøÓu¼</¶U¦ý5‚«X~±Dí
Ø\moG

hosts/nixos/common/optional/xmonad/Main.hs

@@ -44,7 +44,7 @@ main =
         ("M-w", spawn "rofi -show window"),
         ("M-g", spawn myBrowser),
         ("M-d", spawn "Discord"),
-        ("M-v", spawn "alacritty -e vimclip"),
+        ("M-v", spawn "alacritty -e 'vimclip'"),
         ("M-s", spawn "spectacle -rcb"),
         ("M-S-s", spawn "spectacle -mcb"),
         ("M-C-s", spawn "spectacle -ucb"),
@@ -61,11 +61,11 @@ main =
     layouts = tall ||| Full
     myLayoutHook = spacingHook layouts
 
-    startupApps =
-      [ (0, "alacritty"),
-        (1, "google-chrome-stable"),
-        (2, "Discord")
-      ]
+    startupApps = []
+    -- [ (0, "alacritty"),
+    --   (1, "google-chrome-stable"),
+    --   (2, "Discord")
+    -- ]
 
     startup :: X ()
     startup = do

hosts/nixos/common/optional/xmonad/default.nix

@@ -1,14 +1,4 @@
 { pkgs, ... }:
-let
-  catpuccin-sddm = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "sddm";
-    sha256 = "1lg10dyxgz080qfcp6k3zk6374jlj067s6p5fgx5r135ivy8mrki";
-    rev = "bde6932e1ae0f8fdda76eff5c81ea8d3b7d653c0";
-  };
-
-  sddm-theme = "${catpuccin-sddm}/src/caputccin-latte";
-in
 {
   services.xserver = {
     enable = true;
@@ -20,18 +10,17 @@ in
       config = ./Main.hs;
     };
 
+
+    # Proper wallpaper zooming
+    desktopManager.wallpaper.mode = "fill";
+
     displayManager = {
       # make xmonad session the default
       defaultSession = "none+xmonad";
 
-      # enable sddm
-      # sddm = {
-      #   enable = true;
-      #   theme = sddm-theme;
-      # };
-
       # enable startx
-      startx.enable = true;
+      # startx.enable = true;
+      sddm.enable = true;
 
       # autoLogin = {
       #   enable = true;

hosts/nixos/common/users/adrielus.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, outputs, config, ... }:
 let
   # Record containing all the hosts
   hosts = outputs.nixosConfigurations;
@@ -10,12 +10,23 @@ in
   # Password file stored through agenix
   age.secrets.adrielusPassword.file = ./adrielus_password.age;
 
+  # Temporary stuff until I package my keyboard script
+  users.groups.uinput = { };
+  services.udev.extraRules =
+    ''
+      # Access to /dev/uinput
+      KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
+    '';
+
   users = {
     # Configure users through nix only
     mutableUsers = false;
 
     # Create an user named adrielus
     users.adrielus = {
+      # Make fish the default shell
+      shell = pkgs.fish;
+
       # File containing my password, managed by agenix
       passwordFile = config.age.secrets.adrielusPassword.path;
 
@@ -28,21 +39,22 @@ in
         "docker" # Allows me to use docker (?)
         "audio" # Allows me to use audio devices
         "video" # Allows me to use a webcam
+        "uinput" # I think this let's me write to virtual devices
+        "input" # Does this let me use evdev (?)
 
         # TODO: find out why I added these here a long time ago
         "sound"
-        "input"
         "tty"
       ];
 
       # Adds me to some default groups, and creates the home dir 
       isNormalUser = true;
-    };
 
-    openssh.authorizedKeys.keyFiles =
-      builtins.attrValues # attrsetof path -> path[]
-        (builtins.mapAttrs # ... -> attrsetof host -> attrsetof path
-          (name: _: idKey name) # string -> host -> path
-          hosts);
+      openssh.authorizedKeys.keyFiles =
+        builtins.attrValues # attrsetof path -> path[]
+          (builtins.mapAttrs # ... -> attrsetof host -> attrsetof path
+            (name: _: idKey name) # string -> host -> path
+            hosts);
+    };
   };
 }

hosts/nixos/common/users/adrielus_password.age

@@ -1,8 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 UUF9JQ AWyd+vbllVT7QeD8xfu8D4NhxEA1RxwYCKwxGIrkIEw
-m7/XC6vhyhHW5vY+48bxmBsb6Zfhof+mavhq1fdpd+U
--> E-grease s%$ F5jZ"f E(>8 x|#B"9
-dilxxi2WlTIReh+uvkscDubze9MyfGaW7Tn22L6p8X8YZ40muPOtVaWkgQBv1OLo
-SkccszU/cr1NEJm62YOPZGnmK96MwxA/ZWnlG5Ls/my47MqymDq7/1ySWKU5xA
---- wOqvODKflq/JZT0/Qssb8FEl/IDNou+yKMGPn/nI81Q
-m>W¨u!ĚNą@˝ĎĎ‹yB"űGÉłĆL'A)+)áĆEzQü$Ł"Z;w-
+-> ssh-ed25519 UUF9JQ BIl9Xb3n31DCiJiEVdgSrS9Q8mV+QKHIz9pbaskbZkY
+umx6izgXtyrI7x15bAB+NtpezVWuI1ohtV3N9g7KSDU
+-> ssh-ed25519 qgVaDQ kYRngT8940XS/6SACGO86KxNlwOLx7iZFewv+6rGRF0
++a5xQXtda8sSBCyKPGNugfozqANpVmCzXowfC6JmleA
+-> UpxQQ-grease $( d6} t4iN^
+ovdi6zgEwERhuIeRtKdKn1FPOXIovnHzueGofkQ5kbIAQRH+RSBv3L5767h+YD5m
+fKThMcdEvfwr92NHHCzPPJmigMbRUtQonDu4TGnB/XrNF8xEYiri+6S41e9CMQcQ
+/F7W
+--- bc2aF9M+2m+ZXrGsObUCYvZEvFhVEZnKTu/T81Lka0s
+€Sï±ÙbÅ
+ÔÚÐc•|$ô}Óˆ“<CB86>Á&VÄ ·,RÜ™»Èˆˆ·Þ¡à_0Y ›Ä1÷pœ(„òÄz‡˜œ¦$`;P#JXÿŠPÆ0£¬ºŒï
!Šè8mN}B#½ÅÓô|ÚoönsŒh