change hyprland to niri

flake.lock

@@ -758,6 +758,64 @@
         "type": "github"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1763891121,
+        "narHash": "sha256-Arwlg5N1ssnSxPiTMYFNgZL/oGZvVJRtFHMEWOvVkk4=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "d2c10541bad1e7c9341fd269ec35da54a2c48219",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1763887185,
+        "narHash": "sha256-uuwCdsGQUXoTSS02ShZAq+PeWudn0xu4vKpH43OubX8=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "efbe29f3faa69282aad110b7da74f3c41f8971cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1762267440,
@@ -790,6 +848,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1763622513,
+        "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1748929857,
@@ -877,6 +951,26 @@
         "type": "github"
       }
     },
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763899714,
+        "narHash": "sha256-qsp91fwNj5SoqrZKGFqBMRZcEbrP6v7UoWaCxTQoJes=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "faa074c330581cc4a065e592717045ba4fe1fc5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -976,9 +1070,11 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprpolkitagent": "hyprpolkitagent",
+        "niri": "niri",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
+        "noctalia": "noctalia",
         "nvf": "nvf",
         "spicetify-nix": "spicetify-nix",
         "stylix": "stylix"
@@ -1263,6 +1359,39 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1763704521,
+        "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,7 +1,6 @@
 {
   description = ''
-    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+    Dhimas config based on nixy
-    It's a simple way to manage your system configuration and dotfiles.
   '';
 
   inputs = {
@@ -27,6 +26,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nvf.url = "github:notashelf/nvf";
+    niri = {
+      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs @ {nixpkgs, ...}: {

home/programs/firefox/default.nix

@@ -1,4 +1,8 @@
-{ pkgs, inputs, ... }: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   programs.firefox = {
     enable = true;
     profiles.dark = {
@@ -52,7 +56,8 @@
         order = ["Searx" "google"];
         engines = {
           "Nix Packages" = {
-            urls = [{
+            urls = [
+              {
                 template = "https://search.nixos.org/packages";
                 params = [
                   {
@@ -64,35 +69,37 @@
                     value = "{searchTerms}";
                   }
                 ];
-            }];
+              }
-            icon =
+            ];
-              "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+            icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
             definedAliases = ["@np"];
           };
           "NixOS Wiki" = {
-            urls = [{
+            urls = [
+              {
                 template = "https://nixos.wiki/index.php?search={searchTerms}";
-            }];
+              }
+            ];
             icon = "https://nixos.wiki/favicon.png";
             updateInterval = 24 * 60 * 60 * 1000; # every day
             definedAliases = ["@nw"];
           };
           "Searx" = {
-            urls = [{
+            urls = [
+              {
                 template = "https://searx.aicampground.com/?q={searchTerms}";
-            }];
+              }
+            ];
             icon = "https://nixos.wiki/favicon.png";
             updateInterval = 24 * 60 * 60 * 1000; # every day
             definedAliases = ["@searx"];
           };
           bing.metaData.hidden = true;
-          google.metaData.alias =
+          google.metaData.alias = "@g"; # builtin engines only support specifying one additional alias
-            "@g"; # builtin engines only support specifying one additional alias
         };
       };
 
-      extensions.packages =
+      extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
-        with inputs.firefox-addons.packages.${pkgs.system}; [
         bitwarden
         multi-account-containers
         zotero-connector

home/programs/helix/default.nix

@@ -0,0 +1,18 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  programs.helix = {
+    enable = true;
+    languages = {
+      language = [
+        {
+          name = "nix";
+          auto-format = true;
+          formatter.command = "${pkgs.nixfmt}/bin/nixfmt";
+        }
+      ];
+    };
+  };
+}

home/programs/nvf/default.nix

@@ -1,6 +1,10 @@
-{ inputs, pkgs, ... }: {
+{
-  inputs = [
+  inputs,
-    inputs.nfv.homeManagerModules.default
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.nvf.homeManagerModules.default
     ./options.nix
     ./languages.nix
     ./picker.nix
@@ -9,5 +13,12 @@
     ./utils.nix
     ./mini.nix
   ];
-  programs.nvf = { enable = true; };
+  programs.nvf = {
+    enable = true;
+    settings.vim = {
+      startPlugins = [
+        pkgs.vimPlugins.vim-kitty-navigator
+      ];
+    };
+  };
 }

home/programs/nvf/languages.nix

@@ -74,7 +74,7 @@
 
       php = {
         enable = true;
-        server = "intelephense";
+        lsp.server = "intelephense";
       };
       go.enable = true;
       markdown = {

home/programs/spicetify/default.nix

@@ -1,14 +1,17 @@
 # Spicetify is a spotify client customizer
-{ pkgs, config, lib, inputs, ... }:
+{
-let
+  pkgs,
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+  config,
+  lib,
+  inputs,
+  ...
+}: let
+  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
   accent = "${config.lib.stylix.colors.base0D}";
+  background = "${config.lib.stylix.colors.base00}";
 in {
   imports = [inputs.spicetify-nix.homeManagerModules.default];
 
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [ "spotify" ];
-
   stylix.targets.spicetify.enable = false;
 
   programs.spicetify = {
@@ -21,6 +24,9 @@ in {
       button = accent;
       button-active = accent;
       tab-active = accent;
+      player = background;
+      main = background;
+      sidebar = background;
     };
 
     enabledExtensions = with spicePkgs.extensions; [
@@ -31,6 +37,7 @@ in {
       adblock
       fullAppDisplay
       shuffle
+      keyboardShortcut
     ];
   };
 }

home/system/hyprland/polkitagent.nix

@@ -1,7 +1,8 @@
-{ inputs, pkgs, ... }: {
+{
-  home.packages =
+  inputs,
-    [ inputs.hyprpolkitagent.packages."${pkgs.system}".hyprpolkitagent ];
+  pkgs,
-
+  ...
-  wayland.windowManager.hyprland.settings.exec-once =
+}: {
-    [ "systemctl --user start hyprpolkitagent" ];
+  home.packages = [inputs.hyprpolkitagent.packages."${pkgs.stdenv.hostyPlatform.system}".hyprpolkitagent];
+  wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start hyprpolkitagent"];
 }

home/system/niri/default.nix

@@ -0,0 +1,244 @@
+{
+  pkgs,
+  config,
+  inputs,
+  ...
+}: let
+  noctalia = cmd:
+    ["noctalia-shell" "ipc" "call"]
+    ++ (pkgs.lib.splitString " " cmd);
+in {
+  imports = [inputs.niri.homeModules.niri inputs.noctalia.homeModules.default];
+  home.packages = with pkgs; [
+    wayland-utils
+    libsecret
+    cage
+    xwayland-satellite
+    libnotify
+    cliphist
+    cava
+    kdePackages.polkit-kde-agent-1
+    nautilus
+    direnv
+    imv
+  ];
+
+  programs.niri = {
+    enable = true;
+    settings = {
+      prefer-no-csd = true;
+      hotkey-overlay.skip-at-startup = true;
+      environment = {
+        NIXOS_OZONE_WL = "1";
+        QT_QPA_PLATFORM = "wayland";
+        ELECTRON_OZON_PLATFORM_HINT = "wayland";
+        DISPLAY = ":0"; # Or null
+        _JAVA_AWT_WM_NONREPARENTING = "1";
+      };
+      cursor = {
+        hide-when-typing = true;
+        hide-after-inactive-ms = 1000;
+      };
+
+      binds = with config.lib.niri.actions; {
+        "Mod+Space".action.spawn = noctalia "launcher toggle";
+        "Mod+P".action.spawn = noctalia "sessionMenu toggle";
+        "Mod+V".action.spawn = noctalia "launcher clipboard";
+        "Mod+Shift+C".action.spawn = noctalia "launcher calculator";
+        "Mod+C".action.spawn = noctalia "calendar toggle";
+        "Mod+S".action.spawn = noctalia "controlCenter toggle";
+        "Mod+F12".action.spawn = noctalia "powerProfile cycle";
+        "XF86AudioLowerVolume".action.spawn = noctalia "volume decrease";
+        "XF86AudioRaiseVolume".action.spawn = noctalia "volume increase";
+        "XF86AudioMute".action.spawn = noctalia "volume muteOutput";
+        "XF86MonBrightnessUp".action.spawn = noctalia "brightness increase";
+        "XF86MonBrightnessDown".action.spawn = noctalia "brightness decrease";
+        "XF86AudioPlay".action.spawn = noctalia "media playPause";
+        "XF86AudioNext".action.spawn = noctalia "media next";
+        "XF86AudioPrev".action.spawn = noctalia "media previous";
+        "Mod+Shift+Q".action.spawn = noctalia "lockScreen lock";
+        "Mod+Return".action.spawn = ["alacritty"];
+        "Mod+E".action.spawn = ["nautilus"];
+        "Mod+B".action.spawn = ["firefox"];
+        "Mod+U".action = move-workspace-up;
+        "Mod+I".action = move-workspace-down;
+        "Mod+Shift+Slash".action = show-hotkey-overlay;
+        "Mod+Q".action = close-window;
+        "Mod+H".action = focus-column-or-monitor-left;
+        "Mod+L".action = focus-column-or-monitor-right;
+        "Mod+J".action = focus-window-or-monitor-down;
+        "Mod+K".action = focus-window-or-monitor-up;
+        "Mod+Shift+H".action = move-column-left-or-to-monitor-left;
+        "Mod+Shift+L".action = move-column-right-or-to-monitor-right;
+        "Mod+Shift+J".action = move-window-down-or-to-workspace-down;
+        "Mod+Shift+K".action = move-window-up-or-to-workspace-up;
+        "Mod+Ctrl+K".action = move-window-to-workspace-up;
+        "Mod+Ctrl+J".action = move-window-to-workspace-down;
+        "Mod+0".action = focus-workspace 0;
+        "Mod+1".action = focus-workspace 1;
+        "Mod+2".action = focus-workspace 2;
+        "Mod+3".action = focus-workspace 3;
+        "Mod+4".action = focus-workspace 4;
+        "Mod+5".action = focus-workspace 5;
+        "Mod+6".action = focus-workspace 6;
+        "Mod+7".action = focus-workspace 7;
+        "Mod+8".action = focus-workspace 8;
+        "Mod+9".action = focus-workspace 9;
+        "Mod+Shift+Period".action = move-workspace-to-monitor-next;
+        "Mod+Shift+Comma".action = move-workspace-to-monitor-previous;
+        "Mod+Comma".action = consume-or-expel-window-left;
+        "Mod+Period".action = consume-or-expel-window-right;
+        "Mod+Grave".action = toggle-overview;
+        "Mod+Tab".action = focus-workspace-previous;
+        "Mod+Equal".action = set-column-width "+5%";
+        "Mod+Minus".action = set-column-width "-5%";
+        "Mod+Shift+Equal".action = set-window-height "+5%";
+        "Mod+Shift+Minus".action = set-window-height "-5%";
+        "Mod+F".action = maximize-column;
+        "Mod+Shift+F".action = fullscreen-window;
+        "Mod+Ctrl+Shift+F".action = toggle-windowed-fullscreen;
+        "Mod+Y".action = toggle-window-floating;
+        "Mod+Shift+Y".action = switch-focus-between-floating-and-tiling;
+        "Mod+W".action = toggle-column-tabbed-display;
+        "Mod+Parenright".action = switch-layout "next";
+        "Mod+Parenleft".action = switch-layout "prev";
+        "Mod+Shift+E".action = quit;
+      };
+
+      input = {
+        warp-mouse-to-focus.enable = true;
+        focus-follows-mouse.enable = false;
+        trackpoint = {
+          accel-profile = "adaptive";
+          accel-speed = 0.6;
+        };
+      };
+      layout = {
+        focus-ring = {
+          width = 2;
+        };
+      };
+      window-rules = [
+        {
+          geometry-corner-radius = let
+            r = 4.0;
+          in {
+            top-left = r;
+            top-right = r;
+            bottom-left = r;
+            bottom-right = r;
+          };
+          clip-to-geometry = true;
+        }
+        {
+          matches = [{app-id = "firefox";}];
+          open-maximized = true;
+        }
+        {
+          matches = [{app-id = "chromium-browser";}];
+          open-maximized = true;
+        }
+      ];
+      # debug = {
+      #   honor-xdg-activation-with-invalid-serial = 1;
+      # };
+    };
+  };
+
+  programs.noctalia-shell = {
+    enable = true;
+    systemd.enable = true;
+    settings = {
+      general = {
+        animationSpeed = 2;
+        compactLockScreen = true;
+      };
+      wallpaper = {
+        enabled = false;
+        directory = "~/Pictures/wallpapers";
+      };
+      dock.enabled = false;
+      bar = {
+        density = "compact";
+        position = "right";
+        showCapsule = false;
+        widgets = {
+          left = [
+            {
+              id = "SidePanelToggle";
+              useDistroLogo = true;
+            }
+            {
+              id = "WiFi";
+            }
+            {
+              id = "Bluetooth";
+            }
+          ];
+          center = [
+            {
+              hideUnoccupied = false;
+              id = "Workspace";
+              labelMode = "none";
+            }
+          ];
+          right = [
+            {
+              colorizeIcons = true;
+              drawerEnabled = true;
+              id = "Tray";
+            }
+            {
+              alwaysShowPercentage = false;
+              id = "Battery";
+              warningThreshold = 30;
+            }
+            {
+              formatHorizontal = "HH:mm";
+              formatVertical = "HH mm";
+              id = "Clock";
+              useMonospacedFont = true;
+              usePrimaryColor = true;
+            }
+          ];
+        };
+      };
+      colorSchemes.predefinedScheme = "Monochrome";
+      general = {
+        avatarImage = "/home/dim/.face";
+        radiusRatio = 0.2;
+      };
+      location = {
+        monthBeforeDay = false;
+        name = "Tangerang";
+      };
+    };
+    # this may also be a string or a path to a JSON file,
+    # but in this case must include *all* settings.
+  };
+
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      window.decorations = "None";
+    };
+  };
+
+  services.kanshi = {
+    enable = true;
+    profiles = {
+      rumah = {
+        outputs = [
+          {
+            criteria = "LG Electronics 16EN33 305INKH5P181";
+            position = "0,0";
+          }
+          {
+            criteria = "eDP-1";
+            position = "0,768";
+          }
+        ];
+      };
+    };
+  };
+}

home/system/waybar/default.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (config.var.theme.bar) position;
   inherit (config.var.theme) rounding border-size gaps-in gaps-out;
 in {
@@ -10,11 +13,12 @@ in {
       enable = true;
       target = "hyprland-session";
     };
-    settings = [{
+    settings = [
+      {
         layer = "top";
         position = position;
-      modules-left = [ "hyprland/workspaces" "hyprland/window" ];
+        modules-left = ["hyprland/workspaces" "mpris"];
-      modules-center = [ "mpris" ];
+        modules-center = [];
         modules-right = [
           "idle_inhibitor"
           "backlight"
@@ -25,7 +29,6 @@ in {
           "temperature"
           "clock"
           "privacy"
-        "custom/cuaca"
           "wireplumber"
           "tray"
         ];
@@ -185,7 +188,8 @@ in {
           "exec" = "curl -s 'https://wttr.in/Tangerang?format=1'";
           "exec-if" = "ping wttr.in -c1";
         };
-    }];
+      }
+    ];
 
     style = ''
       * { border: none; border-radius: 0; }

hosts/laptop/configuration.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
-    # ../../nixos/nvidia.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
-    # ../../nixos/prime.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
-
     ../../nixos/audio.nix
     ../../nixos/auto-upgrade.nix
     ../../nixos/bluetooth.nix
@@ -13,7 +14,8 @@
     ../../nixos/systemd-boot.nix
     ../../nixos/timezone.nix
     ../../nixos/tuigreet.nix
-    ../../nixos/tlp.nix
+    # ../../nixos/tlp.nix
+    ../../nixos/upower.nix
     ../../nixos/users.nix
     ../../nixos/utils.nix
     ../../nixos/virtualisation.nix

hosts/laptop/home.nix

@@ -1,11 +1,16 @@
-{ pkgs, config, inputs, ... }: {
+{
-
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
   imports = [
     ./variables.nix
 
     # Programs
     ../../home/programs/kitty
-    ../../home/programs/nfv
+    ../../home/programs/nvf
+    ../../home/programs/helix
     ../../home/programs/shell
     ../../home/programs/pass
     ../../home/programs/fetch
@@ -23,18 +28,19 @@
     ../../home/scripts # All scripts
 
     # System (Desktop environment like stuff)
-    ../../home/system/hyprland
+    # ../../home/system/hyprland
-    ../../home/system/hypridle
+    # ../../home/system/hypridle
-    ../../home/system/hyprlock
+    # ../../home/system/hyprlock
-    ../../home/system/hyprpaper
+    # ../../home/system/hyprpaper
-    ../../home/system/wofi
+    # ../../home/system/wofi
+    # ../../home/system/waybar
+    # ../../home/system/dunst
     ../../home/system/batsignal
     ../../home/system/zathura
     ../../home/system/mime
     ../../home/system/udiskie
     ../../home/system/clipman
-    ../../home/system/waybar
+    ../../home/system/niri
-    ../../home/system/dunst
 
     # ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
@@ -51,6 +57,8 @@
     };
   };
 
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) ["intelephense" "spotify"];
   home = {
     inherit (config.var) username;
     homeDirectory = "/home/" + config.var.username;

hosts/laptop/variables.nix

@@ -4,11 +4,10 @@
   config.var = {
     hostname = "dark";
     username = "dim";
+    fullname = "Dhimas Widrayato";
     uid = 1000;
-    hashedPassword =
+    hashedPassword = "$y$j9T$OqKMt8etf8DgTrZhN9jzy/$biMoM3P.WPZMpk0DAK.QhaHjGOL23pEgxlSvfu9LEPD";
-      "$y$j9T$OqKMt8etf8DgTrZhN9jzy/$biMoM3P.WPZMpk0DAK.QhaHjGOL23pEgxlSvfu9LEPD";
+    configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
-    configDirectory = "/home/" + config.var.username
-      + "/.config/nixos"; # The path of the nixos configuration directory
 
     keyboardLayout = "us";
 
@@ -29,8 +28,7 @@
 
     autoUpgrade = false;
     autoGarbageCollector = false;
-    cpuTempSensor =
+    cpuTempSensor = "/sys/devices/platform/thinkpad_hwmon/hwmon/hwmon5/temp1_input";
-      "/sys/devices/platform/thinkpad_hwmon/hwmon/hwmon5/temp1_input";
 
     theme = import ../../themes/var/nixy.nix;
   };

nixos/nix.nix

@@ -1,6 +1,13 @@
 { config, inputs, ... }:
 let autoGarbageCollector = config.var.autoGarbageCollector;
 in {
+  security.sudo.extraRules = [{
+    users = [ config.var.username ];
+    commands = [{
+      command = "/run/current-system/sw/bin/nixos-rebuild";
+      options = [ "NOPASSWD" ];
+    }];
+  }];
   nixpkgs.config = {
     allowUnfree = true;
     allowBroken = true;

nixos/tuigreet.nix

@@ -3,8 +3,7 @@
     enable = true;
     settings = {
       default_session = {
-        command =
+        command = "${pkgs.tuigreet}/bin/tuigreet --remember --asterisks --container-padding 2 --time --time-format '%I:%M %p | %a • %h | %F' --cmd niri-session";
-          "${pkgs.tuigreet}/bin/tuigreet --remember --asterisks --container-padding 2 --time --time-format '%I:%M %p | %a • %h | %F' --cmd Hyprland";
         user = "greeter";
       };
     };
@@ -37,5 +36,4 @@
     # WatchdogDevice = "/dev/watchdog";
     DefaultTimeoutStopSec = "10s";
   };
-
 }

nixos/upower.nix

@@ -0,0 +1,5 @@
+{
+  services.tlp.enable = false;
+  services.tuned.enable = true;
+  services.upower.enable = true;
+}

nixos/users.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, inputs, ... }:
+{
-let
+  config,
+  pkgs,
+  inputs,
+  ...
+}: let
   username = config.var.username;
   hashedPassword = config.var.hashedPassword;
   userId = config.var.uid;
@@ -14,10 +18,10 @@ in {
   programs.xfconf.enable = true;
   services.tumbler.enable = true;
 
-  hardware.graphics = {
+  # hardware.graphics = {
-    package =
+  #   package =
-      inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}.mesa;
+  #     inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}.mesa;
-  };
+  # };
 
   users = {
     defaultUserShell = pkgs.zsh;
@@ -25,7 +29,7 @@ in {
       hashedPassword = "${hashedPassword}";
       uid = userId;
       isNormalUser = true;
-      description = "${username} account";
+      description = config.var.fullname;
       extraGroups = ["networkmanager" "wheel" "audio" "video" "input"];
     };
   };

nixos/xdg-portal.nix

@@ -1,9 +1,29 @@
 {pkgs, ...}: {
+  # xdg.portal = {
+  #   enable = true;
+  #   config.common.default = "*";
+  #   wlr.enable = true;
+  #   xdgOpenUsePortal = true;
+  #   extraPortals = [ pkgs.xdg-desktop-portal pkgs.xdg-desktop-portal-gtk ];
+  # };
   xdg.portal = {
     enable = true;
-    config.common.default = "*";
-    wlr.enable = true;
     xdgOpenUsePortal = true;
-    extraPortals = [ pkgs.xdg-desktop-portal pkgs.xdg-desktop-portal-gtk ];
+    wlr.enable = true;
+    config = {
+      common = {
+        default = [
+          "gtk"
+          "gnome"
+        ];
       };
+      niri = {
+        default = [
+          "gtk"
+          "gnome"
+        ];
+      };
+    };
+  };
+  xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal-gtk];
 }