flake.lock

@@ -220,11 +220,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738453229,
+        "lastModified": 1736143030,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -332,7 +332,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -371,7 +371,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_12"
+        "systems": "systems_11"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -520,11 +520,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1738455488,
+        "lastModified": 1738284694,
-        "narHash": "sha256-tiMwjSEMyIQ9UnQ7/UmxvTnigdgBW2DC/17dxbsih+w=",
+        "narHash": "sha256-vLDweuBMu8fOyo9YMiV/1p9gxH5/OVm8zKRkGpbcuUA=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "e70f8833e2ba4903324449da7f2116b75de67537",
+        "rev": "025719c1d82fd32a82d8d8a4a138842ed92480c1",
         "type": "github"
       },
       "original": {
@@ -567,11 +567,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738448366,
+        "lastModified": 1738275749,
-        "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
+        "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
+        "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",
         "type": "github"
       },
       "original": {
@@ -681,11 +681,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1738437019,
+        "lastModified": 1738273002,
-        "narHash": "sha256-XPl2sQ6x5Dtw4XrrLMp1ERQSG1/heV6JJ9Gthm2SCMw=",
+        "narHash": "sha256-R1CWBSEHZhykHo3/H3M4U7zLv1QaS87JCTHas38TNiU=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "64fefa3749868e6170b6275963c6528456a7d9f2",
+        "rev": "ef03f6911694413b1b06aba727ad9ab089a511f7",
         "type": "github"
       },
       "original": {
@@ -694,31 +694,6 @@
         "type": "github"
       }
     },
-    "hyprland-portal": {
-      "inputs": {
-        "hyprland-protocols": "hyprland-protocols_3",
-        "hyprlang": "hyprlang_3",
-        "hyprutils": "hyprutils_3",
-        "hyprwayland-scanner": "hyprwayland-scanner_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_7"
-      },
-      "locked": {
-        "lastModified": 1737634991,
-        "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
-    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -769,31 +744,6 @@
         "type": "github"
       }
     },
-    "hyprland-protocols_3": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland-portal",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland-portal",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737556638,
-        "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
     "hyprland-qt-support": {
       "inputs": {
         "hyprlang": [
@@ -920,35 +870,6 @@
         "type": "github"
       }
     },
-    "hyprlang_3": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland-portal",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland-portal",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland-portal",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737634606,
-        "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -999,31 +920,6 @@
         "type": "github"
       }
     },
-    "hyprutils_3": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland-portal",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland-portal",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737632363,
-        "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "006620eb29d54ea9086538891404c78563d1bae1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
     "hyprwayland-scanner": {
       "inputs": {
         "nixpkgs": [
@@ -1074,31 +970,6 @@
         "type": "github"
       }
     },
-    "hyprwayland-scanner_3": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland-portal",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland-portal",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735493474,
-        "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
@@ -1143,14 +1014,14 @@
         "nixpkgs-stable": "nixpkgs-stable_2",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "sops-nix": "sops-nix",
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
-        "lastModified": 1738417913,
+        "lastModified": 1737974228,
-        "narHash": "sha256-kDvtRkmeXtFo6UrxFCLRWxyPbNhwyIzb5vRXmPZ3D/k=",
+        "narHash": "sha256-Dlca5iXvpks65wfwKw67H/OB3pDuvv3zXjImLc7rwFs=",
         "owner": "ngi-nix",
         "repo": "ngipkgs",
-        "rev": "22541f0b0b4375ac55590981b0c529620cea8a4f",
+        "rev": "4d6c17428e6e32f474e8fc75a87b8f9bd6c6356d",
         "type": "github"
       },
       "original": {
@@ -1225,11 +1096,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1738410390,
+        "lastModified": 1738142207,
-        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
         "type": "github"
       },
       "original": {
@@ -1264,11 +1135,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1738362438,
+        "lastModified": 1738282823,
-        "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=",
+        "narHash": "sha256-F9Npwxwy6xoTLKYcWFeTsk7MTVKxK9IeT1lsSSCjExg=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2",
+        "rev": "6afe9691509edbfdcd9b2f4a703c6ed5c588255e",
         "type": "github"
       },
       "original": {
@@ -1395,14 +1266,13 @@
         "home-manager": "home-manager",
         "hypridle": "hypridle",
         "hyprland": "hyprland",
-        "hyprland-portal": "hyprland-portal",
         "lix-module": "lix-module",
         "ngipkgs": "ngipkgs",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "sops-nix": "sops-nix_2",
-        "systems": "systems_10",
+        "systems": "systems_9",
         "waybar": "waybar",
         "wpaperd": "wpaperd",
         "yazi": "yazi"
@@ -1522,11 +1392,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738291974,
+        "lastModified": 1737411508,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
+        "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
+        "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
         "type": "github"
       },
       "original": {
@@ -1551,21 +1421,6 @@
       }
     },
     "systems_10": {
-      "locked": {
-        "lastModified": 1680978846,
-        "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
-        "owner": "nix-systems",
-        "repo": "x86_64-linux",
-        "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "x86_64-linux",
-        "type": "github"
-      }
-    },
-    "systems_11": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1580,7 +1435,7 @@
         "type": "github"
       }
     },
-    "systems_12": {
+    "systems_11": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1671,21 +1526,6 @@
       }
     },
     "systems_7": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_8": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1700,7 +1540,7 @@
         "type": "github"
       }
     },
-    "systems_9": {
+    "systems_8": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1715,6 +1555,21 @@
         "type": "github"
       }
     },
+    "systems_9": {
+      "locked": {
+        "lastModified": 1680978846,
+        "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
+        "owner": "nix-systems",
+        "repo": "x86_64-linux",
+        "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "x86_64-linux",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1766,11 +1621,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738399335,
+        "lastModified": 1737793892,
-        "narHash": "sha256-OvtDGDUX0P5oz/LzhzeAcGfd6ihlUHPMKR4CZgnScTA=",
+        "narHash": "sha256-Dl7JEjpno+4dv66ZhqQyHT3zWw6d51fJ0cphu0Aejqk=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "0d5a4f82eca6df03b73908244d1dcd5fec2c3584",
+        "rev": "481b01d9af1e34b7501665bbfc0b19fce5082eb5",
         "type": "github"
       },
       "original": {
@@ -1785,7 +1640,7 @@
           "nixpkgs"
         ],
         "rust-overlay": "rust-overlay_2",
-        "systems": "systems_11"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1734445299,
@@ -1849,11 +1704,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1738314122,
+        "lastModified": 1738174915,
-        "narHash": "sha256-lyA97h4cKYgX/RX2IDw1J3XWCj9rC4v2yW70nEX2wYo=",
+        "narHash": "sha256-oN18XGFcTwk58F8REqx3DTeCD+z3LAanWVznZ0P3ESc=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "c41f2e21e039c068d4ae1d286f2a8a9eef182895",
+        "rev": "b6cb1fa8d3fb3fafea7a190f23acaeb44333cfe9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -41,10 +41,6 @@
       url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland-portal = {
-      url = "github:hyprwm/xdg-desktop-portal-hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     hypridle = {
       url = "github:hyprwm/hypridle";
       inputs.nixpkgs.follows = "nixpkgs";

home/modules/cli/utilities/paMixer/default.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      pamixer
-      ;
-  };
-}

home/modules/gui/apps/code/zed/config/userKeymaps/default.nix

@@ -16,10 +16,10 @@
       "alt-s" = "editor::MoveLineDown";
     };
   }
-  # {
+  {
-  #   bindings = {
+    bindings = {
-  #     context = "Workspace";
+      context = "Workspace";
-  #     "ctrl-s" = "workspace::SaveAll";
+      "ctrl-s" = "workspace::SaveAll";
-  #   };
+    };
-  # }
+  }
 ]

home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix

@@ -8,28 +8,4 @@
       feishin
       ;
   };
-  xdg.configFile."feishin.config.json".text = ''
-    {
-    	"window_has_frame": true,
-    	"bounds": {
-    		"x": 0,
-    		"y": 0,
-    		"width": 2560,
-    		"height": 1080
-    	},
-    	"maximized": true,
-    	"fullscreen": false,
-    	"theme": "system",
-    	"resume": true,
-    	"lyrics": [
-    		"Genius",
-    		"lrclib.net",
-    		"NetEase"
-    	],
-    	"window_window_bar_style": "linux",
-    	"window_minimize_to_tray": false,
-    	"window_enable_tray": false,
-    	"window_start_minimized": false,
-    	"window_exit_to_tray": false
-      }'';
 }

home/modules/gui/desktop/flameshot/default.nix

@@ -22,7 +22,7 @@ in
       General = {
         disabledTrayIcon = true;
         showStartupLaunchMessage = false;
-        disabledGrimWarning = true;
+        # disabledGrimWarning = true;
       };
     };
   };

home/modules/gui/desktop/hyprland/config/exec-once.nix

@@ -23,6 +23,4 @@ in
   "bluetoothctl power on"
   "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
   "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
-  "systemctl --user import-environment PATH"
-  "systemctl --user restart xdg-desktop-portal.service"
 ]

home/modules/gui/desktop/hyprland/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  # pkgs,
   flake,
   config,
   ...
@@ -29,7 +29,7 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
     xwayland.enable = true;
     systemd.enable = false;
     settings = configImports;

nixos/modules/bluetooth.nix

@@ -1,19 +1,10 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-
-{
   hardware = {
     bluetooth = {
       enable = true;
       package = pkgs.bluez;
       powerOnBoot = true;
-      settings = {
+      settings = {General = {Experimental = true;};};
-        General = {
-          Experimental = true;
-        };
-      };
       disabledPlugins = [
         "sap"
       ];

nixos/modules/fonts.nix

@@ -35,72 +35,8 @@ in
         iosevka
         ;
       inherit (pkgs.nerd-fonts)
-        _0xproto
-        _3270
-        agave
-        anonymice
-        arimo
-        aurulent-sans-mono
-        bigblue-terminal
-        bitstream-vera-sans-mono
-        blex-mono
-        caskaydia-cove
-        caskaydia-mono
-        code-new-roman
-        comic-shanns-mono
-        commit-mono
-        cousine
-        d2coding
-        daddy-time-mono
-        dejavu-sans-mono
-        departure-mono
-        droid-sans-mono
-        envy-code-r
-        fantasque-sans-mono
-        fira-code
-        fira-mono
-        geist-mono
-        go-mono
-        gohufont
-        hack
-        hasklug
-        heavy-data
-        hurmit
-        im-writing
-        inconsolata
-        inconsolata-go
-        inconsolata-lgc
-        intone-mono
-        iosevka-term
-        iosevka-term-slab
-        jetbrains-mono
-        lekton
-        liberation
-        lilex
-        martian-mono
         monaspace
-        monofur
+        fantasque-sans-mono
-        monoid
-        mononoki
-        mplus
-        noto
-        open-dyslexic
-        overpass
-        profont
-        proggy-clean-tt
-        recursive-mono
-        roboto-mono
-        sauce-code-pro
-        shure-tech-mono
-        space-mono
-        symbols-only
-        terminess-ttf
-        tinos
-        ubuntu
-        ubuntu-mono
-        ubuntu-sans
-        victor-mono
-        zed-mono
         ;
     };
   };

nixos/modules/hyprland/default.nix

@@ -10,4 +10,13 @@
     "thunar"
     "wayland"
   ];
+  environment = {
+    variables = {
+      WLR_NO_HARDWARE_CURSORS = "1";
+      WLR_DRM_NO_ATOMIC = "1";
+      FLAMESHOT_ENABLE_WAYLAND = "1";
+      USE_WAYLAND_GRIM = "1";
+      USE_WAYLAND_CLIPBOARD = "1";
+    };
+  };
 }

nixos/modules/hyprland/hyprland.nix

@@ -1,14 +1,18 @@
 {
   pkgs,
-  flake,
+  # flake,
   ...
-}:
+}: {
-{
   programs.hyprland = {
     enable = true;
     xwayland.enable = true;
-    package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
-    portalPackage = flake.inputs.hyprland-portal.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+  };
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+    ];
   };
   nix = {
     settings = {
@@ -20,13 +24,4 @@
       ];
     };
   };
-  environment = {
-    variables = {
-      WLR_NO_HARDWARE_CURSORS = "1";
-      WLR_DRM_NO_ATOMIC = "1";
-      FLAMESHOT_ENABLE_WAYLAND = "1";
-      USE_WAYLAND_GRIM = "1";
-      USE_WAYLAND_CLIPBOARD = "1";
-    };
-  };
 }

nixos/modules/hyprland/wayland.nix

@@ -1,18 +1,20 @@
-{ pkgs, flake, ... }:
+{ pkgs, ... }:
 {
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   xdg = {
     portal = {
       enable = true;
-      wlr.enable = true;
-      xdgOpenUsePortal = true;
       extraPortals = builtins.attrValues {
         inherit (pkgs)
+          xdg-desktop-portal-hyprland
+          xdg-desktop-portal-wlr
+          # xdg-desktop-portal-kde
           xdg-desktop-portal-gtk
           ;
       };
+      wlr.enable = true;
+      xdgOpenUsePortal = true;
     };
   };
-
 }

nixos/modules/ollama.nix

@@ -14,13 +14,13 @@ in
 {
   services = {
     ollama = {
-      acceleration = "rocm";
+      # acceleration = "rocm";
-      package = pkgs.ollama.override {
+      # package = pkgs.ollama.override {
-        config = {
+      #   config = {
-          rocmSupport = true;
+      #     rocmSupport = true;
-          cudaSupport = false;
+      #     cudaSupport = false;
-        };
+      #   };
-      };
+      # };
       enable = true;
       group = service.name;
       host = "http://${localhost}";

systems/desktop/config/filesystem.nix

@@ -71,11 +71,11 @@ in
     in
     {
       "/" = {
-        device = "/dev/disk/by-uuid/c22a06af-8855-4938-9d04-68cd4d88d7f0";
+        device = "/dev/disk/by-uuid/5c416d6a-9c2b-4b0c-9e0e-9bb3bf56a863";
         fsType = "ext4";
       };
       "/boot" = {
-        device = "/dev/disk/by-uuid/7B8C-1E95";
+        device = "/dev/disk/by-uuid/B1B8-E776";
         fsType = "vfat";
         options = desktop.boot.options;
       };
@@ -85,7 +85,7 @@ in
     // (builtins.listToAttrs (map sambaMounts sambaDrives));
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/8c9d0c0b-0bc8-442b-a3fd-02a37acd409f"; }
+    { device = "/dev/disk/by-uuid/644ad843-337d-429f-abb8-2423c8ed111e"; }
   ];
 
   systemd.tmpfiles.rules = [