diff --git a/flake.lock b/flake.lock index 1f1271e..d495bdd 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1751740947, - "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=", + "lastModified": 1753216019, + "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "dfc1db15a08c4cd234288f66e1199c653495301f", + "rev": "be166e11d86ba4186db93e10c54a141058bdce49", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1751808145, - "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=", + "lastModified": 1754305013, + "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f", + "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", "type": "github" }, "original": { @@ -591,17 +591,19 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1751995875, - "narHash": "sha256-ud9sl1RjmzAzalH2ocmGPs182xvr7GktjVIYvzJamwo=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "9517d0eaa4ef93de67dc80fecca7a826f7ad556d", - "type": "github" + "lastModified": 1755687691, + "narHash": "sha256-o9co4SENS25l3L5RQJ4PY3pCJAs35jjz7K8GU905Chs=", + "ref": "refs/heads/main", + "rev": "1ac1ff457ab8ef1ae6a8f2ab17ee7965adfa729f", + "revCount": 6383, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-protocols": { @@ -746,11 +748,11 @@ ] }, "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", "type": "github" }, "original": { @@ -847,11 +849,11 @@ ] }, "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "lastModified": 1753622892, + "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", "type": "github" }, "original": { @@ -904,11 +906,11 @@ ] }, "locked": { - "lastModified": 1751888065, - "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=", + "lastModified": 1754481650, + "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "a8229739cf36d159001cfc203871917b83fdf917", + "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd", "type": "github" }, "original": { @@ -956,11 +958,11 @@ ] }, "locked": { - "lastModified": 1751881472, - "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=", + "lastModified": 1751897909, + "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120", + "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", "type": "github" }, "original": { @@ -1009,11 +1011,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1755717263, - "narHash": "sha256-XxmzhryQyxDV8QWbJzScF7n6hxKnRE4WkJCiFZFtpwM=", + "lastModified": 1755721557, + "narHash": "sha256-wnATot/FjVYjZkt5hc3vr+aOXeYFGpOWB2Sve5MywTA=", "ref": "refs/heads/main", - "rev": "33dc50df7ad7f514f4dacc8cde0d01e16ff793e9", - "revCount": 3756, + "rev": "609720f540b4373d98dec66b8efacc3ffae6845a", + "revCount": 3760, "type": "git", "url": "https://git.sakamoto.dev/kenji/illogical-impulse.git" }, @@ -1401,11 +1403,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", "type": "github" }, "original": { @@ -1652,11 +1654,11 @@ ] }, "locked": { - "lastModified": 1751300244, - "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", + "lastModified": 1753633878, + "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", + "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ef3b208..9df5616 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ }; hyprland = { - url = "github:hyprwm/Hyprland"; + url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 1efe95b..6983d9e 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -6,17 +6,21 @@ specialArgs, ... }: { - imports = [ - ./hardware-configuration.nix - ../../modules/default/apps.nix - ../../modules/default/desktop.nix - ../../modules/default/remote.nix - ../../modules/default/gaming.nix - ../../modules/default/udev.nix - ../../modules/default/boot.nix - ../../modules/default/dev.nix - ../../modules/default/security.nix - ]; + imports = + [ + ./hardware-configuration.nix + ../../modules/default/apps.nix + ../../modules/default/desktop.nix + ../../modules/default/remote.nix + ../../modules/default/gaming.nix + ../../modules/default/udev.nix + ../../modules/default/boot.nix + ../../modules/default/dev.nix + ../../modules/default/security.nix + ] + ++ lib.optionals (myConfig.nixos.enableSteamOS == false) [ + ../../modules/default/login.nix + ]; system.stateVersion = "25.05"; @@ -136,14 +140,6 @@ getty.autologinUser = lib.mkOverride 10 "${myConfig.essentials.Username}"; - greetd = { - enable = true; - settings.default_session = { - user = lib.mkOverride 10 "${myConfig.essentials.Username}"; - command = lib.mkOverride 10 "Hyprland"; - }; - }; - flatpak.enable = true; seatd.enable = true; upower.enable = true; diff --git a/modules/default/desktop.nix b/modules/default/desktop.nix index 76ee9dc..31193f5 100644 --- a/modules/default/desktop.nix +++ b/modules/default/desktop.nix @@ -1,6 +1,7 @@ { lib, myConfig, + pkgs, ... }: { imports = [ diff --git a/modules/default/login.nix b/modules/default/login.nix new file mode 100644 index 0000000..aa405a8 --- /dev/null +++ b/modules/default/login.nix @@ -0,0 +1,13 @@ +{ + lib, + myConfig, + ... +}: { + greetd = { + enable = true; + settings.default_session = { + user = lib.mkOverride 10 "${myConfig.essentials.Username}"; + command = lib.mkOverride 10 "Hyprland"; + }; + }; +}