Update to address home-manager config changes

flake.lock

@@ -778,11 +778,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719037157,
-        "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
+        "lastModified": 1722462338,
+        "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
+        "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1063,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1722141560,
-        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
+        "lastModified": 1722415718,
+        "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
+        "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce",
         "type": "github"
       },
       "original": {

home/modules/linux/graphical/default.nix

@@ -57,7 +57,6 @@ in
       feh # For images?
       deluge # Torrent client
       pavucontrol # PulseAudio control panel
-      cinnamon.nemo # File manager
       thunderbird # Email
       sublime-music # For navidrome
       cinny-desktop
@@ -72,8 +71,10 @@ in
       mpv # for anki
       anki-bin
 
+      # Chat stuff
       tdesktop
       whatsapp-for-linux
+      slack
 
       librewolf
 
@@ -82,11 +83,7 @@ in
       # sct # Display color temperature
       xdg-utils # Open stuff
       wifi-indicator
-    ] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
-      gnome.cheese # Webcam check, expensive
-      # Chat stuff
-      slack
-    ]));
+    ]);
 
     nki.programs.discord.enable = pkgs.stdenv.isx86_64;
     nki.programs.discord.package = pkgs.vesktop;

home/modules/linux/graphical/wayland.nix

@@ -14,7 +14,7 @@ let
       systemd.user.services.swaync.Unit.PartOf = lib.mkForce [ "sway-session.target" ];
 
       programs.my-sway.waybar = {
-        extraSettings = {
+        extraSettings = [{
           modules-right = mkAfter [ "custom/swaync" ];
           modules."custom/swaync" = {
             tooltip = false;
@@ -36,7 +36,7 @@ let
             on-click-right = "${swaync}/bin/swaync-client -d -sw";
             escape = true;
           };
-        };
+        }];
         extraStyle = mkAfter ''
           #custom-swaync {
               background: #F0FFFF;

home/modules/programs/my-sway/default.nix

@@ -110,12 +110,12 @@ in
         default = barWith: [ (barWith { }) ];
       };
       extraSettings = mkOption {
-        type = types.raw;
+        type = types.listOf types.raw;
         description = "Extra settings to be included with every default bar";
-        default = { };
+        default = [ ];
       };
       extraStyle = mkOption {
-        type = types.str;
+        type = types.lines;
         description = "Additional style for the default waybar";
         default = "";
       };
@@ -409,7 +409,7 @@ in
 
   config.programs.waybar =
     let
-      barWith = { showMedia ? true, showConnectivity ? true, extraSettings ? { }, ... }: (mkMerge [{
+      barWith = { showMedia ? true, showConnectivity ? true, extraSettings ? { }, ... }: mkMerge ([{
         position = "top";
         modules-left = [
           "sway/workspaces"
@@ -598,9 +598,9 @@ in
             "on-click" = "${playerctl} play-pause";
           };
         };
-      }
+      }] ++
       cfg.waybar.extraSettings
-        extraSettings]);
+      ++ [ extraSettings ]);
     in
     mkIf cfg.enable {
       enable = true;

home/nki-framework.nix

@@ -48,6 +48,21 @@
       tap = "enabled";
     };
   };
+  programs.my-sway.waybar.extraSettings =
+    let
+      change-mode = pkgs.writeScript "change-mode" ''
+        #!/usr/bin/env ${lib.getExe pkgs.fish}
+        set -ax PATH ${lib.getBin pkgs.power-profiles-daemon} ${lib.getBin pkgs.rofi} ${lib.getBin pkgs.ripgrep}
+
+        set profiles (powerprofilesctl list | rg "^[ *] (\S+):" -r '$1')
+        set selected_index (math (contains -i (powerprofilesctl get) $profiles) - 1)
+        set new_profile (printf "%s\n" $profiles | rofi -dmenu -p "Switch to power profile" -a $selected_index)
+        powerprofilesctl set $new_profile
+      '';
+    in
+    [{
+      modules."battery"."on-click" = change-mode;
+    }];
 
   # input-remapping
   xdg.configFile."autostart/input-remapper-autoload.desktop".source =
@@ -61,16 +76,32 @@
   # Multiple screen setup
   services.kanshi = with config.common.monitors; {
     enable = true;
-    profiles.undocked.outputs = [{
+    settings = [
+      {
+        profile.name = "undocked";
+        profile.outputs = [{ criteria = "eDP-1"; }];
+      }
+      {
+        profile.name = "work-both";
+        profile.outputs = [
+          {
             criteria = "eDP-1";
-    }];
-    profiles.work-both.outputs = [
-      { criteria = "eDP-1"; position = "0,${toString (builtins.floor ((2160 / work.scale - 1200) + 1200 / 3))}"; status = "enable"; }
+            position = "0,${toString (builtins.floor ((2160 / work.scale - 1200) + 1200 / 3))}";
+            status = "enable";
+          }
           { criteria = work.name; position = "1920,0"; }
         ];
-    profiles.work-one.outputs = [
-      { criteria = "eDP-1"; status = "disable"; }
-      { criteria = config.common.monitors.work.name; }
+      }
+      {
+        profile.name = "work-one";
+        profile.outputs = [
+          {
+            criteria = "eDP-1";
+            status = "disable";
+          }
+        ];
+      }
+      { output.criteria = config.common.monitors.work.name; }
     ];
   };
 

kagami-air-m1/configuration.nix

@@ -70,7 +70,7 @@
   services.printing.drivers = with pkgs; [ epfl-cups-drivers ];
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
   # Keyboard
   services.input-remapper.enable = true;
   services.input-remapper.serviceWantedBy = [ "multi-user.target" ];

modules/common/linux/default.nix

@@ -27,6 +27,17 @@ let
       };
     };
 
+    graphics = { config, ... }: {
+      hardware =
+        if config.system.nixos.release == "24.05" then {
+          opengl.enable = true;
+          opengl.driSupport32Bit = true;
+        } else {
+          graphics.enable = true;
+          graphics.enable32Bit = true;
+        };
+    };
+
     accounts = { pkgs, ... }: mkIf (config.common.linux.enable && !pkgs.stdenv.isAarch64) {
       environment.systemPackages = with pkgs.gnome; [ pkgs.glib gnome-control-center ];
       services.accounts-daemon.enable = true;
@@ -104,7 +115,7 @@ let
   };
 in
 {
-  imports = with modules; [ adb ios wlr logitech kwallet virtualisation accounts rt-audio ];
+  imports = with modules; [ adb ios graphics wlr logitech kwallet virtualisation accounts rt-audio ];
 
   options.common.linux = {
     enable = mkOption {
@@ -256,14 +267,18 @@ in
     i18n.defaultLocale = "ja_JP.UTF-8";
     # Input methods (only fcitx5 works reliably on Wayland)
     i18n.inputMethod = {
-      enabled = "fcitx5";
       fcitx5.waylandFrontend = true;
       fcitx5.addons = with pkgs; [
         fcitx5-mozc
         fcitx5-unikey
         fcitx5-gtk
       ];
-    };
+    } // (if config.system.nixos.release == "24.05" then {
+      enabled = "fcitx5";
+    } else {
+      enable = true;
+      type = "fcitx5";
+    });
 
     # Default packages
     environment.systemPackages = with pkgs; [
@@ -293,8 +308,6 @@ in
     programs.dconf.enable = true;
     # Gaming! (not for ARM64)
     programs.steam.enable = !pkgs.stdenv.isAarch64;
-    hardware.opengl.enable = true;
-    hardware.opengl.driSupport32Bit = !pkgs.stdenv.isAarch64; # For 32 bit applications
 
     ## Services
     # OpenSSH so you can SSH to me

modules/personal/fonts/mounting.nix

@@ -12,7 +12,7 @@ lib.mkIf pkgs.stdenv.isLinux {
         name = "system-icons";
         paths = with pkgs; [
           #libsForQt5.breeze-qt5  # for plasma
-          gnome.gnome-themes-extra
+          (pkgs.gnome-themes-extra or gnome.gnome-themes-extra) # Until 24.11
         ];
         pathsToLink = [ "/share/icons" ];
       };

nki-framework/configuration.nix

@@ -20,7 +20,7 @@
   # services.xserver.enable = true;
   # services.xserver.displayManager.sddm.enable = true;
   # services.xserver.displayManager.sddm.wayland.enable = true;
-  services.xserver.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # Power Management
   services.upower = {
@@ -40,7 +40,7 @@
   services.printing.drivers = with pkgs; [ epfl-cups-drivers ];
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
   # Keyboard
   services.input-remapper.enable = true;
   services.input-remapper.serviceWantedBy = [ "multi-user.target" ];

nki-yoga-g8/configuration.nix

@@ -27,7 +27,7 @@
     ed25519PrivateKey = config.sops.secrets."tinc-private-key".path;
   };
 
-  services.xserver.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # Power Management
   services.upower = {