Merge pull request #2 from rwxae/nixos

Migrate to Hyprland Wayland with gaming setup and desktop overhaul

flake.lock

···
         ]
       },
       "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1760948891,
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
         "type": "github"
       },
       "original": {
···
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1694529238,
···
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
···
         ]
       },
       "locked": {
-        "lastModified": 1760500983,
-        "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=",
+        "lastModified": 1762146130,
+        "narHash": "sha256-/XOEA0a61fZ45i/BpaSsyLNNbw/yKwjMbkB/IWSGLzU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa",
+        "rev": "b5ed4afc2277339bdf0e9edf59befff7350cf075",
         "type": "github"
       },
       "original": {
···
         ]
       },
       "locked": {
-        "lastModified": 1760338583,
-        "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=",
+        "lastModified": 1762039661,
+        "narHash": "sha256-oM5BwAGE78IBLZn+AqxwH/saqwq3e926rNq5HmOulkc=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf",
+        "rev": "c3c8c9f2a5ed43175ac4dc030308756620e6e4e4",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760524057,
-        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
         "type": "github"
       },
       "original": {
···
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": [
+          "quickshell"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1762156721,
+        "narHash": "sha256-gHfzrTDSnNC5yRJwkZfP55fPHUc8DuB4OQEIBSQSs18=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "5ca5aa602f58a8e0e73fedbef351f1cdf8cbe981",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
···
         ]
       },
       "locked": {
-        "lastModified": 1760626018,
-        "narHash": "sha256-egSsb7gdTxRBWHIaaZ1NDb1ge3okW76rrac2Uv9ovic=",
+        "lastModified": 1762165260,
+        "narHash": "sha256-fUkSZyRJR621oqbvrlu18HOxOCWF8u5K65gHB1LjlgU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0381717a9b6f53e531ae6315894220c223e2060b",
+        "rev": "49ef67af9c6f773cf6a235997d960838eba38c5f",
         "type": "github"
       },
       "original": {
···
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1760153667,
-        "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=",
+        "lastModified": 1762093557,
+        "narHash": "sha256-esmyNNa8TvduITLfqYPSMroyZ9vxJr2nsvjYmHmO+Ag=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d",
+        "rev": "20d8fca94dceaf943686598da7fba31b37100e50",
         "type": "github"
       },
       "original": {
···
         "type": "github"
       }
     },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1761897390,
+        "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=",
+        "owner": "outfoxxed",
+        "repo": "quickshell",
+        "rev": "fc704e6b5d445899a1565955268c91942a4f263f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "outfoxxed",
+        "repo": "quickshell",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs",
+        "noctalia": "noctalia",
         "nur": "nur",
         "nvf": "nvf",
+        "quickshell": "quickshell",
         "solaar": "solaar",
         "stylix": "stylix",
+        "vicinae": "vicinae",
         "zen-browser": "zen-browser"
       }
     },
···
         "snowfall-lib": "snowfall-lib"
       },
       "locked": {
-        "lastModified": 1760109596,
-        "narHash": "sha256-kZ7DKnhg5w2coWHaJWrMjBNlbC94ZmxA5Jpvw9thZhQ=",
+        "lastModified": 1761840426,
+        "narHash": "sha256-CprKgnLGKpNB0leamU9hw+ZgocRAsEFevyqIuY0FSiY=",
         "owner": "Svenum",
         "repo": "Solaar-Flake",
-        "rev": "04a3de5d7b98342e6212d5426250439eee82471b",
+        "rev": "7b5e221d60195d77fda5c2d69087f7cd1b8d3c20",
         "type": "github"
       },
       "original": {
···
           "nixpkgs"
         ],
         "nur": "nur_2",
-        "systems": "systems_3",
+        "systems": "systems_4",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
···
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1760472212,
-        "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=",
+        "lastModified": 1762101397,
+        "narHash": "sha256-wGiL2K3kAyBBmIZpJEskaSIgyzzpg0zwfvri+Sy6/CI=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db",
+        "rev": "8c0640d5722a02178c8ee80a62c5f019cab4b3c1",
         "type": "github"
       },
       "original": {
···
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
···
         "type": "github"
       }
     },
+    "vicinae": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1762153854,
+        "narHash": "sha256-atFJwetnAf68duKurwdSRWK9iE1Lls2GqbLB+cxjlvo=",
+        "owner": "vicinaehq",
+        "repo": "vicinae",
+        "rev": "f44603ee228ebd63e10457c1dfd9702f79d0eb65",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vicinaehq",
+        "repo": "vicinae",
+        "type": "github"
+      }
+    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
···
         ]
       },
       "locked": {
-        "lastModified": 1760588585,
-        "narHash": "sha256-NufqXao2i6d7N1HFKp8hM8XAD8Q6s/zU2wNd065Ybus=",
+        "lastModified": 1762131860,
+        "narHash": "sha256-sIPhzkDrfe6ptthZiwoxQyO6rKd9PgJnl+LOyythQkI=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "5a651a6a3bb5c9bd694adbd2c34f55b4abff9a2c",
+        "rev": "10e69cb268b1d3dc91135e72f5462b2acfbcc3aa",
         "type": "github"
       },
       "original": {

flake.nix

···
     stylix.inputs.nixpkgs.follows = "nixpkgs";
     nix-darwin.url = "github:LnL7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
-    # TODO: https://github.com/NixOS/nixpkgs/issues/327982
+    quickshell.url = "github:outfoxxed/quickshell";
+    quickshell.inputs.nixpkgs.follows = "nixpkgs";
+    noctalia.url = "github:noctalia-dev/noctalia-shell";
+    noctalia.inputs.nixpkgs.follows = "nixpkgs";
+    noctalia.inputs.quickshell.follows = "quickshell";
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
     zen-browser.inputs.nixpkgs.follows = "nixpkgs";
     nvf.url = "github:notashelf/nvf";
     nvf.inputs.nixpkgs.follows = "nixpkgs";
     solaar.url = "github:Svenum/Solaar-Flake/main";
     solaar.inputs.nixpkgs.follows = "nixpkgs";
+    vicinae.url = "github:vicinaehq/vicinae";
   };
 
   outputs =
···
         nixos = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs; };
           modules = [
+            nur.modules.nixos.default
+            home-manager.nixosModules.home-manager
             stylix.nixosModules.stylix
             solaar.nixosModules.default
-            home-manager.nixosModules.home-manager
             ./hosts/nixos/configuration.nix
           ];
         };
···
         mac = nix-darwin.lib.darwinSystem {
           specialArgs = { inherit inputs; };
           modules = [
-            stylix.darwinModules.stylix
             nur.modules.darwin.default
             home-manager.darwinModules.home-manager
+            stylix.darwinModules.stylix
             ./hosts/mac/configuration.nix
           ];
         };

home/linux/avizo.nix home/linux/swww.nix

···
 { ... }:
 
 {
-  services.avizo = {
+  services.swww = {
     enable = true;
   };
 }

home/linux/cliphist.nix

···
+{ ... }:
+
+{
+  services.cliphist = {
+    enable = true;
+  };
+}

home/linux/default.nix

···
 {
   imports = [
     ../shared
-    ./avizo.nix
     ./chromium.nix
+    ./cliphist.nix
     ./easyeffects.nix
+    ./flameshot.nix
     ./gtk.nix
+    ./hyprland.nix
     ./mpv.nix
     ./obs.nix
     ./packages.nix
-    ./rofi.nix
-    ./sway.nix
-    ./swaync.nix
+    ./swww.nix
+    ./vicinae.nix
     ./zathura.nix
   ];
 }

home/linux/flameshot.nix

···
+{ ... }:
+
+{
+  services.flameshot = {
+    enable = true;
+    settings = {
+      General = {
+        disabledTrayIcon = true;
+        showStartupLaunchMessage = false;
+        useGrimAdapter = true;
+        disabledGrimWarning = true;
+      };
+    };
+  };
+}

home/linux/hyprland.nix

···
+{ lib, pkgs, ... }:
+
+{
+  wayland.windowManager.hyprland = {
+    enable = true;
+    systemd.enable = false;
+    package = null;
+    portalPackage = null;
+    plugins = with pkgs.hyprlandPlugins; [
+      hypr-dynamic-cursors
+    ];
+    settings =
+      let
+        mod = "SUPER";
+        mainDesktop = "DP-1";
+        secondDesktop = "HDMI-A-2";
+        numbers = lib.stringToCharacters "123456789";
+        letters = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
+        launchApp = app: "uwsm app -- ${app}";
+      in
+      {
+        input = {
+          kb_layout = "us,ru";
+          kb_options = "grp:caps_toggle";
+          repeat_delay = 200;
+          repeat_rate = 35;
+        };
+
+        general = {
+          gaps_in = 0;
+          gaps_out = 0;
+          border_size = 0;
+          allow_tearing = true;
+        };
+
+        decoration = {
+          rounding = 0;
+        };
+
+        animations.enabled = false;
+
+        layerrule = [
+          "blur, vicinae"
+          "ignorealpha 0, vicinae"
+        ];
+
+        windowrulev2 = [
+          "float, class:^(com.saivert.pwvucontrol)$"
+          "float, class:^(nemo)$"
+          "workspace 10 silent, class:^(Chromium-browser)$"
+          "workspace name:e silent, class:^(dev.zed.Zed)$"
+          "workspace name:r silent, class:^(thunderbird)$"
+          "workspace name:t silent, class:^(org.telegram.desktop)$"
+          "workspace name:a silent, class:^(anytype)$"
+          "workspace name:s silent, class:^(Slack)$"
+          "workspace name:d silent, class:^(discord)$"
+          "workspace name:f silent, class:^(zen-beta)$"
+          "workspace name:g silent, class:^(kitty)$"
+          "workspace name:c silent, class:^(chromium-browser)$"
+          "workspace name:b silent, class:^(org.pwmt.zathura)$"
+        ];
+
+        workspace = lib.flatten [
+          "10, monitor:${secondDesktop}"
+          (numbers |> map (w: "${w}, monitor:${mainDesktop}"))
+          "name:f, monitor:${secondDesktop}"
+          (letters |> builtins.filter (w: w != "f") |> map (w: "name:${w}, monitor:${mainDesktop}"))
+        ];
+
+        bind = lib.flatten [
+          "${mod}, space, exec, ${launchApp "vicinae toggle"}"
+
+          ", xf86audiolowervolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+          ", xf86audioraisevolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+          ", xf86audioplay, exec, playerctl play-pause"
+          ", xf86audioprev, exec, playerctl previous"
+          ", xf86audionext, exec, playerctl next"
+
+          "${mod}, h, movefocus, l"
+          "${mod}, j, movefocus, d"
+          "${mod}, k, movefocus, u"
+          "${mod}, l, movefocus, r"
+
+          "${mod}+shift, h, movewindow, l"
+          "${mod}+shift, j, movewindow, d"
+          "${mod}+shift, k, movewindow, u"
+          "${mod}+shift, l, movewindow, r"
+
+          "${mod}+control, h, movecurrentworkspacetomonitor, l"
+          "${mod}+control, l, movecurrentworkspacetomonitor, r"
+          "${mod}+control, q, killactive"
+
+          "${mod}, 0, workspace, 10"
+          (numbers |> map (w: "${mod}, ${w}, workspace, ${w}"))
+          (letters |> map (w: "${mod}, ${w}, workspace, name:${w}"))
+
+          "${mod}+shift, 0, movetoworkspace, 10"
+          (numbers |> map (w: "${mod}+shift, ${w}, movetoworkspace, ${w}"))
+          (letters |> map (w: "${mod}+shift, ${w}, movetoworkspace, name:${w}"))
+        ];
+
+        bindm = [
+          "${mod}, mouse:272, movewindow"
+          "${mod}, mouse:273, resizewindow"
+        ];
+
+        exec-once = [
+          (launchApp "zeditor")
+          (launchApp "thunderbird")
+          (launchApp "Telegram")
+          (launchApp "anytype")
+          (launchApp "slack")
+          (launchApp "discord")
+          (launchApp "zen-beta")
+          (launchApp "kitty")
+        ];
+      };
+  };
+  # TODO: https://github.com/nix-community/stylix/issues/478
+  home.pointerCursor.hyprcursor.enable = true;
+}

home/linux/i3.nix docs/deprecated/i3.nix

···
-# This module has been replaced in favor of sway.nix. Use it for reference.
 { pkgs, ... }:
 
 {

home/linux/packages.nix

···
     authenticator
     pwvucontrol
     prismlauncher
+    heroic
     vial
-    gcolor3
     nemo
     krita
     yandex-music
+    hyprpicker
 
     # CLI
     tesseract
     playerctl
+    wl-clipboard
 
     # TODO: Should be in the /shared/packages
     anytype # https://github.com/NixOS/nixpkgs/pull/411491

home/linux/sway.nix docs/deprecated/sway.nix

···
-{ pkgs, ... }:
+{ ... }:
 
 {
-  home.packages = with pkgs; [
-    wl-clipboard
-    kooha
-  ];
-
   wayland.windowManager.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
···
           }
         ];
       };
-  };
-
-  programs.swaylock.enable = true;
-
-  services = {
-    cliphist.enable = true;
-    flameshot = {
-      enable = true;
-      settings = {
-        General = {
-          disabledTrayIcon = true;
-          showStartupLaunchMessage = false;
-          useGrimAdapter = true;
-          disabledGrimWarning = true;
-        };
-      };
-    };
   };
 }

home/linux/swaync.nix modules/linux/services/solaar.nix

···
 { ... }:
 
 {
-  services.swaync = {
+  services.solaar = {
     enable = true;
   };
 }

home/linux/vicinae.nix

···
+{ inputs, ... }:
+
+{
+  imports = [
+    inputs.vicinae.homeManagerModules.default
+  ];
+
+  services.vicinae = {
+    enable = true;
+  };
+}

home/shared/git.nix

···
 {
   programs.git = {
     enable = true;
-    userName = "wardxela";
-    userEmail = "wardxela" + "@" + "gmail" + "." + "com";
-    extraConfig = {
+    settings = {
+      user = {
+        name = "wardxela";
+        email = "wardxela" + "@" + "gmail" + "." + "com";
+      };
       init = {
         defaultBranch = "main";
       };

home/shared/packages.nix

···
     nvd
     termusic
     glab
+    git-open
 
     # Archiving and compression
     zip

home/shared/zed-editor.nix

···
           inherit dock default_width;
           button = false;
         };
-        chat_panel = {
-          inherit default_width;
-        };
         outline_panel = {
           inherit dock default_width;
           button = false;
···
         terminal = {
           button = false;
         };
-        languages = {
-          JavaScript = {
-            formatter = {
-              code_actions = {
+        languages =
+          let
+            jsLike = {
+              formatter = [ ];
+              code_actions_on_format = {
                 "source.fixAll.eslint" = true;
               };
             };
-          };
-          TypeScript = {
-            formatter = {
-              code_actions = {
-                "source.fixAll.eslint" = true;
-              };
-            };
-          };
-          TSX = {
-            formatter = {
-              code_actions = {
-                "source.fixAll.eslint" = true;
-              };
+          in
+          {
+            JavaScript = jsLike;
+            TypeScript = jsLike;
+            TSX = jsLike;
+            Nix = {
+              language_servers = [
+                "nil"
+                "!nixd"
+              ];
             };
           };
-          Nix = {
-            language_servers = [
-              "nil"
-              "!nixd"
-            ];
-          };
-        };
         lsp = {
           nil = {
             settings = {

hosts/nixos/configuration.nix

···
 
   hardware = {
     graphics.enable = true;
+    nvidia = {
+      open = true;
+    };
     bluetooth = {
       enable = true;
       powerOnBoot = true;
     };
   };
+
+  services.xserver.videoDrivers = [ "nvidia" ];
 
   swapDevices = [
     {

hosts/nixos/hardware-configuration.nix

···
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c95a25db-4d1a-4630-a889-658a2b07079b";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/c95a25db-4d1a-4630-a889-658a2b07079b";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/360C-743E";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/mnt/hdd" = {
+    device = "/dev/disk/by-uuid/ea4787f6-dedb-4357-ad14-96100cf2f178";
+    fsType = "ext4";
+  };
 
-  fileSystems."/mnt/hdd" =
-    { device = "/dev/disk/by-uuid/ea4787f6-dedb-4357-ad14-96100cf2f178";
-      fsType = "ext4";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/360C-743E";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.amn0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

modules/linux/default.nix

···
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [
     ../shared
     ./environment.nix
-    ./programs.nix
+    ./programs
     ./services
   ];
 
···
   networking = {
     hostName = "nixos";
     networkmanager.enable = true;
-  };
-
-  xdg.portal = {
-    enable = true;
-    config.sway = {
-      default = [ "gtk" ];
-      "org.freedesktop.impl.portal.Screenshot" = "wlr";
-      "org.freedesktop.impl.portal.ScreenCast" = "wlr";
-    };
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gtk
-      xdg-desktop-portal-wlr
-    ];
   };
 
   security.polkit.enable = true;

modules/linux/programs.nix modules/linux/programs/default.nix

···
 { ... }:
 
 {
+  imports = [
+    ./hyprland.nix
+    ./steam.nix
+    ./uwsm.nix
+  ];
+
   programs = {
     adb.enable = true;
     amnezia-vpn.enable = true;
     nix-ld.enable = true;
     ssh.startAgent = true;
     bash.blesh.enable = true;
+    gamemode.enable = true;
   };
 }

modules/linux/programs/hyprland.nix

···
+{ ... }:
+
+{
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+  };
+}

modules/linux/programs/steam.nix

···
+{ ... }:
+
+{
+  programs.steam = {
+    enable = true;
+    gamescopeSession.enable = true;
+    protontricks.enable = true;
+  };
+}

modules/linux/programs/uwsm.nix

···
+{ ... }:
+
+{
+  programs.uwsm = {
+    enable = true;
+    waylandCompositors = {
+      hyprland = {
+        prettyName = "Hyprland";
+        comment = "Hyprland compositor managed by UWSM";
+        binPath = "/run/current-system/sw/bin/Hyprland";
+      };
+    };
+  };
+}

modules/linux/services/default.nix

···
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [
     ./gnome.nix
+    ./greetd.nix
+    ./noctalia.nix
     ./openssh.nix
     ./pipewire.nix
-    ./wayland.nix
+    ./solaar.nix
+    ./udev.nix
   ];
-
-  services = {
-    solaar.enable = true;
-    udev.packages = with pkgs; [ vial ];
-  };
 }

modules/linux/services/gnome.nix

···
 { ... }:
 
 {
-  services = {
-    gnome.gnome-keyring.enable = true;
-    gnome.gcr-ssh-agent.enable = false;
+  services.gnome = {
+    gnome-keyring.enable = true;
+    gcr-ssh-agent.enable = false;
   };
 }

modules/linux/services/greetd.nix

···
+{ lib, pkgs, ... }:
+
+{
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${lib.getExe pkgs.tuigreet} --cmd 'uwsm start hyprland-uwsm.desktop'";
+      };
+    };
+  };
+}

modules/linux/services/noctalia.nix

···
+{ inputs, ... }:
+
+{
+  imports = [
+    inputs.noctalia.nixosModules.default
+  ];
+
+  services.noctalia-shell.enable = true;
+}

modules/linux/services/udev.nix

···
+{ pkgs, ... }:
+
+{
+  services.udev = {
+    packages = with pkgs; [ vial ];
+  };
+}

modules/linux/services/wayland.nix

···
-{ pkgs, ... }:
-
-{
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd sway";
-        user = "greeter";
-      };
-    };
-  };
-  security.pam.services.swaylock = { };
-}

modules/linux/services/xserver.nix docs/deprecated/xserver.nix

···
-# This module has been replaced in favor of wayland.nix. Use it for reference.
 { ... }:
 
 {

modules/shared/default.nix

···
         "flakes"
         "pipe-operators"
       ];
+      substituters = [
+        "https://vicinae.cachix.org"
+      ];
+      trusted-public-keys = [
+        "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
+      ];
     };
   };
 

modules/shared/stylix.nix

···
     # - tomorrow-night
     # - ashes
     base16Scheme = "${pkgs.base16-schemes}/share/themes/github-dark.yaml";
-    image = ./assets/black.png;
     fonts = with pkgs; {
       serif = {
         package = eb-garamond;
···
         name = "Inter";
       };
       monospace = {
-        package = nerd-fonts.jetbrains-mono;
-        name = "JetBrainsMono Nerd Font";
+        package = pkgs.lilex;
+        name = "Lilex";
       };
       emoji = {
-        package = nerd-fonts.jetbrains-mono;
-        name = "JetBrainsMono Nerd Font";
+        package = pkgs.lilex;
+        name = "Lilex";
       };
     };
+    cursor = {
+      package = pkgs.nur.repos.adam0.bibata-modern-cursors-classic-hyprcursor;
+      name = "Bibata-Modern-Classic-hyprcursor";
+      size = 24;
+    };
   };
-
-  # TODO:
-  # specialisation.light.configuration.stylix = {
-  #   image = lib.mkForce ./assets/white.png;
-  #   base16Scheme = lib.mkForce "${pkgs.base16-schemes}/share/themes/cupertino.yaml";
-  # };
 }