updated flake

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689825754,
+        "lastModified": 1692248770,
-        "narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=",
+        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "531c3de7eccf95155828e0cd9f18c25e7f937777",
+        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689802112,
+        "lastModified": 1692763155,
-        "narHash": "sha256-Se7oHV/L0dHTQ4xp8MvYafaVdkSzF04Hx5NeloUYHtM=",
+        "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0cb3ac57fca6b52c42e4c0f560185540ae1dfb6c",
+        "rev": "6a20e40acaebf067da682661aa67da8b36812606",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689752456,
+        "lastModified": 1692808169,
-        "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
+        "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
+        "rev": "9201b5ff357e781bf014d0330d18555695df7ba8",
         "type": "github"
       },
       "original": {

maddie/common/ssh/id_ed25519_sk.pub

@@ -1 +0,0 @@
-sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA1jTkcMhBQQoYqNVLofrNnTbB8RCyzSYmdsnPeoOineAAAABHNzaDo= spy@luna (yubikey)

maddie/common/ssh/maddie.pub

@@ -0,0 +1,3 @@
+sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA1jTkcMhBQQoYqNVLofrNnTbB8RCyzSYmdsnPeoOineAAAABHNzaDo= spy@luna (yubikey)
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBO9WsQUnglNetqekCoA6WT0wYNxpUVyNxuktPOHJPBCLJmU9P+YErE915vj4HlYcuOW9UhVajQzLQTcelgs/O8w= M.iPad (Termius)
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD44bc9OdsIxwNBkdIN5Ce+Wer2gWi+QRcFdOV7+ScIo1QS29wkQJxU90ItcKwqiv+oTBlipV2NSH/YroBSHhQI= M.iPad (Secure ShellFish)

maddie/nixos/cider.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    cider
+  ];
+}

maddie/nixos/gtk.nix

@@ -9,16 +9,17 @@
       size = 10;
     };
     theme = {
-      package = pkgs.gruvbox-dark-gtk;
+      package = pkgs.lounge-gtk-theme;
-      name = "gruvbox-dark";
+      name = "Lounge-night-compact";
     };
     iconTheme = {
-      package = pkgs.zafiro-icons;
+      package = pkgs.whitesur-icon-theme;
-      name = "Zafiro-icons-Dark";
+      name = "WhiteSur-dark";
     };
   };
 
   home.packages = with pkgs; [
     gnome.zenity
+    libsForQt5.breeze-gtk
   ];
 }

maddie/nixos/osu.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    osu-lazer-bin
+  ];
+}

maddie/nixos/qt.nix

@@ -1,15 +1,19 @@
 { config, pkgs, lib, ... }:
 
 {
+  home.packages = with pkgs; [
+    libsForQt5.breeze-qt5
+  ];
+
   qt = {
     enable = true;
     style = {
-      package = pkgs.adwaita-qt;
+      package = pkgs.libsForQt5.breeze-qt5;
-      name = "adwaita-dark";
+      name = "Breeze";
     };
   };
 
   home.sessionVariables = {
-    QT_STYLE_OVERRIDE = "adwaita-dark";
+    QT_STYLE_OVERRIDE = "Breeze";
   };
 }

overlays.nix

@@ -34,8 +34,8 @@
         domain = "git.spyhoodle.me";
         owner = "maddie";
         repo = "slstatus";
-        rev = "b22f3d8ec8e2d67bbd32f02721d9d8157a46edd4";
+        rev = "2546de2a4c5ab34d96fb31f75d3a8b7d6840005e";
-        sha256 = "sha256-OhssKVQArcQAgCavkFaCRvxUM3689t1v3YCv9IW7osU=";
+        sha256 = "sha256-aoEd4GGA+jkoxvJlRlXqMiaxM8mZe4Jt5CtKKtnu+rQ=";
       };
     });
     slock = prev.slock.overrideAttrs (oldAttrs: {

systems/mdesktop/boot.nix

@@ -10,6 +10,7 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.initrd.systemd.enable = true;
 
   # Setup crypto keyfile
   boot.initrd.secrets = {

systems/mdesktop/fonts.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     nerdfonts
     font-awesome
     source-han-sans

systems/mdesktop/nvidia.nix

@@ -1,8 +1,18 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
   hardware.opengl.enable = true;
+  hardware.opengl.driSupport = true;
   hardware.opengl.driSupport32Bit = true;
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
+  hardware.nvidia.open = false;
+  hardware.nvidia.modesetting.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
+
+  hardware.opengl.extraPackages = [
+    (pkgs.runCommand "nvidia-icd" { } ''
+      mkdir -p $out/share/vulkan/icd.d
+      cp ${pkgs.linuxPackages.nvidia_x11}/share/vulkan/icd.d/nvidia_icd.x86_64.json $out/share/vulkan/icd.d/nvidia_icd.json
+    '')
+  ];
 }

systems/mdesktop/ssh.nix

@@ -9,5 +9,5 @@
       KbdInteractiveAuthentication = false;
     };
   };
-  programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" ];
+  programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" "ecdsa-sha2-nistp256" ];
 }

systems/mdesktop/syncthing.nix

@@ -10,6 +10,7 @@
     guiAddress = "0.0.0.0:8384";
     overrideFolders = true;
     overrideDevices = true;
+    settings = {
       devices = {
         "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; };
         "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; };
@@ -43,4 +44,5 @@
         };
       };
     };
+  };
 }

systems/mdesktop/users.nix

@@ -6,6 +6,6 @@
     shell = pkgs.zsh;
     description = "Madeleine";
     extraGroups = [ "adbusers" "dialout" "libvirtd" "plugdev" ];
-    openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/id_ed25519_sk.pub ];
+    openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/maddie.pub ];
   };
 }