diff --git a/configuration.nix b/configuration.nix index ec8b927..c090bd8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -94,6 +94,7 @@ jetbrains-mono kime lite + nautilus ]; environment.pathsToLink = [ @@ -118,7 +119,7 @@ # enable = true; # enableSSHSupport = true; # }; - # programs.niri.enable = true; + #programs.niri.enable = true; programs.fish.enable = true; programs.firefox.enable = true; @@ -154,6 +155,6 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "25.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/flake.nix b/flake.nix index 61fc994..b3533af 100644 --- a/flake.nix +++ b/flake.nix @@ -32,14 +32,14 @@ nixos = nixpkgs.lib.nixosSystem { specialArgs = { inherit system niri dankMaterialShell; }; modules = [ - ./configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.extraSpecialArgs = { inherit niri dankMaterialShell; }; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.bangae1 = import ./hm/home.nix {}; - } +# ./sys/desktop.nix + ./configuration.nix + home-manager.nixosModules.home-manager { + home-manager.extraSpecialArgs = { inherit niri dankMaterialShell; }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.bangae1 = import ./hm/home.nix; + } ]; }; }; diff --git a/hm/config.kdl b/hm/config.kdl index 7bda4b9..5c9105c 100644 --- a/hm/config.kdl +++ b/hm/config.kdl @@ -82,7 +82,7 @@ gestures { // Find more information on the wiki: // https://yalter.github.io/niri/Configuration:-Outputs // Remember to uncomment the node by removing "/-"! -output "eDP-1" { +output "Virtual-1" { // Uncomment this line to disable this output. // off @@ -92,10 +92,10 @@ output "eDP-1" { // for the resolution. // If the mode is omitted altogether or is invalid, niri will pick one automatically. // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. - mode "2736x1824@60" + mode "1920x1080@60" // You can use integer or fractional scale, for example use 1.5 for 150% scale. - scale 1.2 + scale 1 // Transform allows to rotate the output counter-clockwise, valid values are: // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. diff --git a/hm/home.nix b/hm/home.nix index f7e4bdc..d57f5e6 100644 --- a/hm/home.nix +++ b/hm/home.nix @@ -23,7 +23,7 @@ enableSpawn = true; }; systemd = { - # enable = true; + enable = true; restartIfChanged = true; }; }; @@ -31,7 +31,7 @@ home.username = "bangae1"; home.homeDirectory = "/home/bangae1"; - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; targets.genericLinux.enable = true; xdg.enable = true; diff --git a/sys/desktop.nix b/sys/desktop.nix index 39d309a..b0e12d7 100644 --- a/sys/desktop.nix +++ b/sys/desktop.nix @@ -1,6 +1,6 @@ -{ pkgs, ...}: +{ pkgs, niri, ...}: { -environment.systemPackages = [pkgs.niri]; +environment.pathsToLink = [ "/wayland-sessions" ]; environment.etc."wayland-sessions/niri.desktop".text = '' [Desktop Entry] Name=niri