From 155d78a4070749775d4375c92cab47c6ec33c73f Mon Sep 17 00:00:00 2001 From: DACHXY Date: Thu, 26 Dec 2024 21:29:02 +0800 Subject: [PATCH] disable xserver --- flake.lock | 467 ++++++++++++++++++++++++++++++++- flake.nix | 16 +- home/config/hypr/bind.conf | 7 +- home/config/neofetch/ascii.txt | 6 - home/config/neofetch/config | 2 +- home/config/wofi/style.css | 138 ---------- home/user/config.nix | 2 +- home/user/default.nix | 1 + home/user/gtk.nix | 2 - home/user/hyprland.nix | 38 +++ home/user/packages.nix | 4 - home/user/programs.nix | 4 +- system/modules/hyprland.nix | 9 +- system/modules/programs.nix | 9 +- system/modules/services.nix | 3 +- 15 files changed, 532 insertions(+), 176 deletions(-) delete mode 100755 home/config/neofetch/ascii.txt delete mode 100755 home/config/wofi/style.css create mode 100644 home/user/hyprland.nix diff --git a/flake.lock b/flake.lock index 2b8655f..1338aca 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,76 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906446, + "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, + "flake-compat": { + "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" + } + }, + "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": [ @@ -21,6 +92,277 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906236, + "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprgrass": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1734643652, + "narHash": "sha256-gnxQWeIitwduGalKZgO21B+7fJAnFRl2nlmPzzKoWno=", + "owner": "horriblename", + "repo": "hyprgrass", + "rev": "b2a1da139bbb4e12d67c9c1569a32ce54f5ebc6b", + "type": "github" + }, + "original": { + "owner": "horriblename", + "repo": "hyprgrass", + "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": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1735209119, + "narHash": "sha256-zarY0tzIHyWcaImbIJOYRbBbHdLRdNDkRfOmzPVapRk=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "e75e2cdac79417ffdbbbe903f72668953483a4e7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "ref": "main", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1735209374, + "narHash": "sha256-V/AE7QfPzfIPW5jC+DaBv5H+Vds0eA02Jkx/+VFhRT4=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "616e7ef0aca905b9b4012d2bedbb9225d51040bf", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, + "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": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906259, + "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "0404833ea18d543df44df935ebf1b497310eb046", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734796073, + "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734793513, + "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -43,16 +385,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "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" } @@ -73,13 +431,112 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734991663, + "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", + "hyprgrass": "hyprgrass", + "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "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": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4f96157..fdbb337 100644 --- a/flake.nix +++ b/flake.nix @@ -2,21 +2,30 @@ description = "danny NixOS"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + + hyprland.url = "github:hyprwm/Hyprland/main"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + hyprgrass = { + url = "github:horriblename/hyprgrass"; + inputs.hyprland.follows = "hyprland"; + }; }; outputs = { self, nixpkgs-unstable, nixpkgs, nix-index-database, ... }@inputs: let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + # pkgs = nixpkgs.legacyPackages.${system}; pkgsUnstable = nixpkgs-unstable.legacyPackages.${system}; - nixvim.url = "github:azuwis/lazyvim-nixvim"; in { formatter.x86_64-linux = @@ -30,6 +39,7 @@ specialArgs = { inherit inputs; inherit pkgsUnstable; + inherit system; }; }; diff --git a/home/config/hypr/bind.conf b/home/config/hypr/bind.conf index bd39e8f..ab2a444 100755 --- a/home/config/hypr/bind.conf +++ b/home/config/hypr/bind.conf @@ -74,11 +74,12 @@ bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow # Media -bind = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%+ -bind = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%- +bind = ,XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ 2%+ +bind = ,XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ 2%- +bind = ,XF86MonBrightnessDown, exec, brightnessctl set 10%- +bind = ,XF86MonBrightnessUp, exec, brightnessctl set 10%+ bind = ,XF86AudioPrev, exec, playerctl previous bind = ,XF86AudioNext, exec, playerctl next bind = ,XF86AudioPlay, exec, playerctl play-pause bind = ,XF86AudioStop, exec, playerctl stop bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle - diff --git a/home/config/neofetch/ascii.txt b/home/config/neofetch/ascii.txt deleted file mode 100755 index 88b7393..0000000 --- a/home/config/neofetch/ascii.txt +++ /dev/null @@ -1,6 +0,0 @@ - - _._ _,-'""`-._ -(,-.`._,'( |\`-/| - `-.-' \ )-`( , o o) - `- \`_`"'- - diff --git a/home/config/neofetch/config b/home/config/neofetch/config index c1d7f0c..be6ed71 100755 --- a/home/config/neofetch/config +++ b/home/config/neofetch/config @@ -134,7 +134,7 @@ image_backend="ascii" # Default: 'auto' # Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' # 'command output (neofetch --ascii "$(fortune | cowsay -W 30)")' -image_source="${HOME}/.config/neofetch/ascii.txt" +# image_source="${HOME}/.config/neofetch/ascii.txt" # Ascii distro (Which distro's ascii art to display). # Default: 'auto' diff --git a/home/config/wofi/style.css b/home/config/wofi/style.css deleted file mode 100755 index 4770022..0000000 --- a/home/config/wofi/style.css +++ /dev/null @@ -1,138 +0,0 @@ -@define-color rosewater #f4dbd6; -@define-color rosewater-rgb rgb(244, 219, 214); -@define-color flamingo #f0c6c6; -@define-color flamingo-rgb rgb(240, 198, 198); -@define-color pink #f5bde6; -@define-color pink-rgb rgb(245, 189, 230); -@define-color mauve #c6a0f6; -@define-color mauve-rgb rgb(198, 160, 246); -@define-color red #ed8796; -@define-color red-rgb rgb(237, 135, 150); -@define-color maroon #ee99a0; -@define-color maroon-rgb rgb(238, 153, 160); -@define-color peach #f5a97f; -@define-color peach-rgb rgb(245, 169, 127); -@define-color yellow #eed49f; -@define-color yellow-rgb rgb(238, 212, 159); -@define-color green #a6da95; -@define-color green-rgb rgb(166, 218, 149); -@define-color teal #8bd5ca; -@define-color teal-rgb rgb(139, 213, 202); -@define-color sky #91d7e3; -@define-color sky-rgb rgb(145, 215, 227); -@define-color sapphire #7dc4e4; -@define-color sapphire-rgb rgb(125, 196, 228); -@define-color blue #8aadf4; -@define-color blue-rgb rgb(138, 173, 244); -@define-color lavender #b7bdf8; -@define-color lavender-rgb rgb(183, 189, 248); -@define-color text #cad3f5; -@define-color text-rgb rgb(202, 211, 245); -@define-color subtext1 #b8c0e0; -@define-color subtext1-rgb rgb(184, 192, 224); -@define-color subtext0 #a5adcb; -@define-color subtext0-rgb rgb(165, 173, 203); -@define-color overlay2 #939ab7; -@define-color overlay2-rgb rgb(147, 154, 183); -@define-color overlay1 #8087a2; -@define-color overlay1-rgb rgb(128, 135, 162); -@define-color overlay0 #6e738d; -@define-color overlay0-rgb rgb(110, 115, 141); -@define-color surface2 #5b6078; -@define-color surface2-rgb rgb(91, 96, 120); -@define-color surface1 #494d64; -@define-color surface1-rgb rgb(73, 77, 100); -@define-color surface0 #363a4f; -@define-color surface0-rgb rgb(54, 58, 79); -@define-color base #24273a; -@define-color base-rgb rgb(36, 39, 58); -@define-color mantle #1e2030; -@define-color mantle-rgb rgb(30, 32, 48); -@define-color crust #181926; -@define-color crust-rgb rgb(24, 25, 38); - -* { - font-family: "Inconsolata Nerd Font", monospace; - font-size: 14px; -} - -/* Window */ -window { - margin: 0px; - padding: 10px; - border: 0.16em solid @lavender; - border-radius: 0.1em; - background-color: @base; -} - -/* Inner Box */ -#inner-box { - margin: 5px; - padding: 10px; - border: none; - background-color: @base; -} - -/* Outer Box */ -#outer-box { - margin: 5px; - padding: 10px; - border: none; - background-color: @base; -} - -/* Scroll */ -#scroll { - margin: 0px; - padding: 10px; - border: none; - background-color: @base; -} - -/* Input */ -#input { - margin: 5px 20px; - padding: 10px; - border: none; - border-radius: 0.1em; - color: @text; - background-color: @base; -} - -#input image { - border: none; - color: @red; -} - -#input * { - outline: 4px solid @red!important; -} - -/* Text */ -#text { - margin: 5px; - border: none; - color: @text; -} - -#entry { - background-color: @base; -} - -#entry arrow { - border: none; - color: @lavender; -} - -/* Selected Entry */ -#entry:selected { - border: 0.11em solid @lavender; -} - -#entry:selected #text { - color: @mauve; -} - -#entry:drop(active) { - background-color: @lavender!important; -} diff --git a/home/user/config.nix b/home/user/config.nix index 8248720..3976adb 100644 --- a/home/user/config.nix +++ b/home/user/config.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: let configDir = ../config; in { diff --git a/home/user/default.nix b/home/user/default.nix index bacc180..18b6748 100644 --- a/home/user/default.nix +++ b/home/user/default.nix @@ -8,6 +8,7 @@ ./programs.nix ./environment.nix ./virtualization.nix + # ./hyprland.nix ]; nixpkgs = { diff --git a/home/user/gtk.nix b/home/user/gtk.nix index 6fd0ed2..35119fd 100644 --- a/home/user/gtk.nix +++ b/home/user/gtk.nix @@ -23,14 +23,12 @@ }; gtk3 = { - # extraCss = gtk-css; extraConfig = { gtk-application-prefer-dark-theme = 1; }; }; gtk4 = { - # extraCss = gtk-css; extraConfig = { gtk-application-prefer-dark-theme = 1; }; diff --git a/home/user/hyprland.nix b/home/user/hyprland.nix new file mode 100644 index 0000000..362720b --- /dev/null +++ b/home/user/hyprland.nix @@ -0,0 +1,38 @@ +{ pkgs, lib, inputs, ... }: + +{ + # Have not figured out how to config throught homeManager yet + wayland.windowManager.hyprland = { + enable = true; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + xwayland.enable = true; + systemd.enable = false; + + plugins = [ + inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars + inputs.hyprgrass.packages.${pkgs.system}.default + ]; + + settings = { + "$mod" = "SUPER"; + bind = [ + "$mod, F, exec, firefox" + "$mod, enter, exec, kitty" + ] + ++ ( + # workspaces + # binds $mod + [shift +] {1..9} to [move to] workspace {1..9} + builtins.concatLists (builtins.genList + (i: + let ws = i + 1; + in + [ + "$mod, code:1${toString i}, workspace, ${toString ws}" + "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" + ] + ) + 9) + ); + }; + }; +} diff --git a/home/user/packages.nix b/home/user/packages.nix index 69a8537..f1f799a 100644 --- a/home/user/packages.nix +++ b/home/user/packages.nix @@ -33,11 +33,7 @@ in pkgs.blueberry # Gaming - # pkgs.steam pkgs.steam-run - # (pkgs.lutris.override { - # extraPkgs = pkgs: [ pkgs.wineWowPackages.stable pkgs.winetricks ]; - # }) # Downloads pkgs.qbittorrent diff --git a/home/user/programs.nix b/home/user/programs.nix index c27e766..9363fe7 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, inputs, ... }: { programs = { neovim = { enable = true; @@ -27,7 +27,6 @@ "font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC"; }; - # firefox = { # enable = true; # languagePacks = [ @@ -42,4 +41,5 @@ # }; # }; }; + } diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix index 81345c6..129c2fe 100644 --- a/system/modules/hyprland.nix +++ b/system/modules/hyprland.nix @@ -1,7 +1,12 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { - programs.hyprland = { enable = true; }; + programs.hyprland = { + enable = true; + withUWSM = true; + xwayland = { enable = true; }; + portalPackage = pkgs.xdg-desktop-portal-hyprland; + }; environment.systemPackages = with pkgs; [ hyprsunset diff --git a/system/modules/programs.nix b/system/modules/programs.nix index b53aeab..966c324 100644 --- a/system/modules/programs.nix +++ b/system/modules/programs.nix @@ -5,8 +5,7 @@ enable = true; wlr.enable = false; xdgOpenUsePortal = false; - extraPortals = - [ pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk ]; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ]; }; programs = { @@ -18,12 +17,6 @@ localNetworkGameTransfers.openFirewall = true; }; - hyprland = { - enable = true; - withUWSM = true; - xwayland = { enable = true; }; - portalPackage = pkgs.xdg-desktop-portal-hyprland; - }; gnupg = { agent = { diff --git a/system/modules/services.nix b/system/modules/services.nix index 654ffff..4abedaf 100644 --- a/system/modules/services.nix +++ b/system/modules/services.nix @@ -27,11 +27,12 @@ }; xserver = { - enable = true; + enable = false; xkb.layout = "us"; }; displayManager = { + sddm.wayland.enable = true; sddm.enable = true; sddm.theme = "${import ./sddm-theme.nix { inherit pkgs; }}"; };