diff --git a/flake.lock b/flake.lock index 1fe5c31..ba8e2f3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734400729, - "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -50,22 +17,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1717312683, @@ -107,11 +58,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1735595376, - "narHash": "sha256-vs9XVWzbdkvoMair896NaT/RlXR5kr5pUM1cTghZ2YI=", + "lastModified": 1736455421, + "narHash": "sha256-TsDbQIHOi84hTjb0SSLSyX27P1MA1DVLagX8uik+WGk=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "d512f5600543250dd510acd0e9da4a7582e3ff8c", + "rev": "6ef757a8f85db7a124d370378850339a899c9e65", "type": "github" }, "original": { @@ -120,28 +71,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -149,11 +78,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -163,232 +92,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734364709, - "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1733684019, - "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "unstable" - ], - "pre-commit-hooks": "pre-commit-hooks", - "systems": [ - "systems" - ], - "xdph": "xdph" - }, - "locked": { - "lastModified": 1734573361, - "narHash": "sha256-rlHkYVDjKXABfAxdcsHnbdZa/0EWE3g/XnR/Ln96rPA=", - "ref": "refs/heads/main", - "rev": "5b714f05f87831e3e930af04649f853d5efb9902", - "revCount": 5570, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1733940128, - "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "3833097e50473a152dd614d4b468886840b4ea78", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734364628, - "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734384247, - "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734384417, - "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -396,11 +99,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -411,11 +114,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1734128415, - "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=", + "lastModified": 1736334301, + "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3", + "rev": "5f4ec93d432cd5288f6fe20d8842dceb5a065885", "type": "github" }, "original": { @@ -427,21 +130,20 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "unstable" ], "nixpkgs-stable": [ "nixpkgs" - ], - "rust-overlay": "rust-overlay" + ] }, "locked": { - "lastModified": 1734620407, - "narHash": "sha256-JarUp0GVny6BwGZaUfIXsSQQcz1w7SGMxgCsJZBdv7U=", + "lastModified": 1736513564, + "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "f6036448ff647e02dcd83f673036ccacbd2922b7", + "rev": "0855bf33427209e4f5e3d2d0968a14784525e929", "type": "github" }, "original": { @@ -452,11 +154,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -468,11 +170,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -498,22 +200,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1733229606, @@ -530,35 +216,10 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1734379367, - "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "ghostty": "ghostty", "home-manager": "home-manager", - "hyprland": "hyprland", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nixos-cosmic": "nixos-cosmic", @@ -569,27 +230,6 @@ "unstable-home-manager": "unstable-home-manager" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734489114, - "narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -622,11 +262,11 @@ }, "unstable": { "locked": { - "lastModified": 1734622375, - "narHash": "sha256-uZJI4MGeZgRZg97ahCjio72a2g36y88L4SYG5AHvnMg=", + "lastModified": 1736519262, + "narHash": "sha256-qnbii+cIEgxrQ0g3ayiSYVU3nmmRj8AOD9miY3fmx7k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7d907cf58a3a5f9fa046329f6eac4ad708aed128", + "rev": "3718eb9874c52f0fd82c2aac2a27fc012fa5f858", "type": "github" }, "original": { @@ -643,11 +283,11 @@ ] }, "locked": { - "lastModified": 1734622158, - "narHash": "sha256-h/fdzqlCqSa2ZCIqtDc9kshCJm6kQIoKuO0MSSmAX4A=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "832920a60833533eaabcc93ab729801bf586fa0c", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -657,47 +297,6 @@ "type": "github" } }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734422917, - "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zig": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index 5d4f67a..f20936c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,6 @@ inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.nixpkgs.follows = "unstable"; }; - # Hyprland - hyprland = { - url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - inputs.nixpkgs.follows = "unstable"; - inputs.systems.follows = "systems"; - }; # Terminal ghostty = { url = "github:ghostty-org/ghostty"; @@ -49,7 +43,6 @@ , home-manager , unstable-home-manager , nix-darwin - , hyprland , nixos-cosmic , nix-flatpak , ghostty @@ -101,7 +94,6 @@ inputs = { inherit ghostty - hyprland unstable; }; }; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 146856c..91ed629 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -25,10 +25,6 @@ in enable = true; kde.enable = true; cosmic.enable = false; - hyprland = { - enable = false; - useNWG = false; - }; crypto.enable = true; }; }; diff --git a/modules/core/nix-substituters.nix b/modules/core/nix-substituters.nix index 34fdfb2..d779056 100644 --- a/modules/core/nix-substituters.nix +++ b/modules/core/nix-substituters.nix @@ -25,19 +25,17 @@ in "https://cache.nixos.org" "https://cache.flox.dev" "https://devenv.cachix.org" - "https://hyprland.cachix.org" - "https://cuda-maintainers.cachix.org" + "https://cuda-maintainers.cachix.org" ] ++ cfg.urls; nix.settings.trusted-substituters = [ "https://cache.flox.dev" "https://devenv.cachix.org" - "https://cuda-maintainers.cachix.org" + "https://cuda-maintainers.cachix.org" ] ++ cfg.urls; nix.settings.trusted-public-keys = [ "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" ] ++ cfg.keys; nix.settings.trusted-users = [ "root" skygUser.name ]; }; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index a17154c..1f827d1 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -4,7 +4,6 @@ let in { imports = [ - ./hyprland ./kde.nix ./cosmic.nix ./wayland.nix @@ -20,12 +19,16 @@ in }; }; config = lib.mkIf cfg.desktop.enable { - services.displayManager.sddm.enable = false; - services.displayManager.sddm.wayland.enable = false; - services.xserver.displayManager.gdm.enable = true; + services.displayManager.enable = true; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.displayManager.sddm.wayland.compositor = "kwin"; + # security.pam.services..kwallet.enable = true; + + services.xserver.displayManager.gdm.enable = false; services.xserver.displayManager.gdm.autoSuspend = false; services.xserver.displayManager.gdm.banner = ''Ari's PC''; - services.xserver.displayManager.gdm.wayland = true; + services.xserver.displayManager.gdm.wayland = false; xdg = { autostart.enable = true; mime.enable = true; @@ -35,16 +38,15 @@ in terminal-exec.enable = true; portal = { enable = true; - wlr.enable = true; - xdgOpenUsePortal = true; - config = { - common.default = [ "gtk" ]; - hyprland.default = [ "gtk" "hyprland" ]; - plasma6.default = [ "gtk" "kde" ]; - }; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; + # wlr.enable = true; + # xdgOpenUsePortal = true; + # config = { + # common.default = [ "*" ]; + # plasma6.default = [ "gtk" "kde" ]; + # }; + # extraPortals = [ + # pkgs.xdg-desktop-portal-gtk + # ]; }; }; }; diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix deleted file mode 100644 index 2271f01..0000000 --- a/modules/nixos/desktop/hyprland/common.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, inputs, ... }: -let - cfg = config.skyg.nixos.desktop.hyprland; -in -{ - config = - let - hyprpkgs = - if cfg.useDevelopmentMode then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system} - else pkgs - ; - in - lib.mkIf cfg.enable { - programs.hyprland = { - enable = true; - package = hyprpkgs.hyprland; - portalPackage = hyprpkgs.xdg-desktop-portal-hyprland; - xwayland.enable = true; - systemd.setPath.enable = true; - }; - - xdg.portal.extraPortals = [ hyprpkgs.xdg-desktop-portal-hyprland ]; - services.hypridle.enable = true; - environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; - environment.systemPackages = with pkgs; [ - # sound - pavucontrol - - # notification daemon - dunst - libnotify - - # App Support - xwaylandvideobridge - lxqt.lxqt-policykit - xdg-desktop-portal - auto-cpufreq - - # general utilities - brightnessctl # brightness ctl - networkmanagerapplet # networking - ]; - # - }; -} diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix deleted file mode 100644 index 44d3b17..0000000 --- a/modules/nixos/desktop/hyprland/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, ... }: -{ - imports = [ - ./common.nix - ./mine.nix - ./nwg-shell.nix - ]; - options = { - skyg.nixos.desktop.hyprland = with lib; { - enable = mkEnableOption - "Hyprland"; - useNWG = mkEnableOption - "nwg-shell experience"; - useDevelopmentMode = mkEnableOption - "use the dev mode of hyprland"; - }; - }; -} diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix deleted file mode 100644 index c307f02..0000000 --- a/modules/nixos/desktop/hyprland/mine.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, lib, pkgs, inputs, system, ... }: -let - cfg = config.skyg.nixos.desktop.hyprland; -in -{ - config = lib.mkIf (cfg.enable && !cfg.useNWG) { - home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = { - enable = true; - xwayland.enable = true; - extraConfig = '' - source = ~/.config/hypr/hyprland.d/*.conf - debug:enable_stdout_logs = true - ''; - }; - programs.hyprlock.enable = true; - environment.systemPackages = - (with pkgs; [ - # general utilities - swappy # screenshot editor - hyprshot # screenshots - cliphist # clipboard manager - gnome.nautilus # file manager - wofi # app launcher - wl-screenrec # screen recorder - slurp # helper selection tools - waypaper # wallpaper manager - swww # wallpaper service - waybar # top bar - nwg-panel # top bar - nwg-dock-hyprland # bottom bar - nwg-displays # display management - nwg-bar # logout window - ]); - system.userActivationScripts.hyprlandMineConfig.text = '' - ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr" - ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar" - ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar" - ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst" - ''; - }; -} diff --git a/modules/nixos/desktop/hyprland/nwg-shell.nix b/modules/nixos/desktop/hyprland/nwg-shell.nix deleted file mode 100644 index 9549468..0000000 --- a/modules/nixos/desktop/hyprland/nwg-shell.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - cfg = config.skyg.nixos.desktop.hyprland; -in -{ - config = mkIf (cfg.enable && cfg.useNWG) { - programs.hyprlock.enable = true; - environment.systemPackages = with pkgs; [ - # general utilities - nwg-bar - nwg-menu - nwg-look - nwg-panel - nwg-hello - nwg-drawer - nwg-wrapper - nwg-displays - nwg-launchers - nwg-dock-hyprland - ]; - }; -} diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 6cb18af..83ef353 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -7,12 +7,6 @@ in config = lib.mkIf cfg.enable { # Flatpak services.flatpak.enable = true; - services.flatpak.remotes = [ - { - name = "flathub"; - location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - } - ]; # Mobile Connect programs.kdeconnect.enable = true; environment.systemPackages = [ ghostty ] ++ (with pkgs; [