diff --git a/flake.lock b/flake.lock index c427d5f..4bad550 100644 --- a/flake.lock +++ b/flake.lock @@ -367,18 +367,20 @@ "hyprland": { "inputs": { "hyprland": "hyprland_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "otter-launcher": "otter-launcher", "woomer": "woomer", "wrappers": "wrappers", "wshowkeys": "wshowkeys" }, "locked": { - "lastModified": 1789823817, - "narHash": "sha256-NcHfahCIytUMUIlbK7B+8e1k92ujdeoCIta3fW1LIAM=", + "lastModified": 1790264545, + "narHash": "sha256-ombw2VPUqYkLlAvX9FrTS07WL21IsjB4n+CsHwUjH00=", "ref": "refs/heads/main", - "rev": "93dc67718a952d01c5c992c4e7fe21c7c09d9028", - "revCount": 85, + "rev": "22a5e42c7c8c5437253f9cbd3df5b449fb6d7c8e", + "revCount": 86, "type": "git", "url": "https://git.voidarc.co.uk/voidarc/hypr" }, @@ -783,22 +785,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1788431191, - "narHash": "sha256-MFClkboDeW56feBCAeAV3Z3J2quGSZFlAOXQ4JjIlIA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b9402b959a2276982ddd5ad3652a38b97f7c40b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1781577229, "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", @@ -831,22 +817,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1789684949, - "narHash": "sha256-ZKhUe/2IJUq1JhKxKMu8rbkgSGmPP2ZCqlIPn40aGCM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e554fab72f81915600f3f449b786fd9af40439a5", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1782175435, "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", @@ -862,7 +832,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1787498568, "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", @@ -878,7 +848,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1789542786, "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=", @@ -894,7 +864,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1787070829, "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=", @@ -910,7 +880,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1786719841, "narHash": "sha256-QcpQOT0NQEFkI77t+YXPZqDJc35iIodG7zinieOwFUg=", @@ -926,7 +896,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1783224372, "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", @@ -942,9 +912,25 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1788431191, + "narHash": "sha256-MFClkboDeW56feBCAeAV3Z3J2quGSZFlAOXQ4JjIlIA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b9402b959a2276982ddd5ad3652a38b97f7c40b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvim": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "wrappers": "wrappers_2" }, "locked": { @@ -1076,7 +1062,7 @@ "hyprgrass": "hyprgrass", "hyprland": "hyprland", "import-tree": "import-tree", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nvim": "nvim", "omnisearch": "omnisearch", @@ -1090,7 +1076,7 @@ }, "sls-steam": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1788435466, @@ -1247,7 +1233,7 @@ "woomer": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "systems": "systems_4" }, "locked": { @@ -1288,7 +1274,7 @@ }, "wrappers": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1789546006, @@ -1306,7 +1292,7 @@ }, "wrappers_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1786998037, @@ -1324,7 +1310,7 @@ }, "wrappers_3": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1788981141, @@ -1365,7 +1351,7 @@ "wshowkeys_2": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1785224811, diff --git a/flake.nix b/flake.nix index ffe7b61..4408997 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,10 @@ # Apps nvim.url = "git+https://git.voidarc.co.uk/voidarc/nvim"; - hyprland.url = "git+https://git.voidarc.co.uk/voidarc/hypr"; + hyprland = { + url = "git+https://git.voidarc.co.uk/voidarc/hypr"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprgrass = { url = "github:horriblename/hyprgrass"; inputs.hyprland.follows = "hyprland/hyprland"; diff --git a/modules/features/hyprland/default.nix b/modules/features/hyprland/default.nix index e41bdf0..4635081 100644 --- a/modules/features/hyprland/default.nix +++ b/modules/features/hyprland/default.nix @@ -43,6 +43,7 @@ services.displayManager.defaultSession = "hyprland"; services.xserver.enable = true; + services.seatd.enable = true; security.polkit.enable = true; environment.systemPackages = with pkgs; [ diff --git a/modules/system/core/default.nix b/modules/system/core/default.nix index 246a979..d7ded2f 100644 --- a/modules/system/core/default.nix +++ b/modules/system/core/default.nix @@ -16,7 +16,7 @@ services = { openssh.enable = true; - avahi.enable = true; + # avahi.enable = true; }; environment.systemPackages = with pkgs; [ vim diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index 897794a..ece85e0 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -20,6 +20,7 @@ description = "user01"; extraGroups = [ "root" + "seat" "wheel" "plugdev" "networkmanager"