byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-01-19 07:05:51 +05:30
Code Issues Packages Projects Releases Wiki Activity

Updated system + hyprland, pinned nwg-dock

Browse source
This commit is contained in:
Emmet 2024-06-12 19:48:23 -05:00
parent 9866b25122
commit bbd631c5b9
3 changed files with 98 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
flake.lock
View file

@ -511,17 +511,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714910346, "lastModified": 1718188849,
"narHash": "sha256-Up5ZFLfAu7BtASVc/Pr7Ay+5QehQ/L9vwF2Q26DRunk=", "narHash": "sha256-bNlu9Iv/BDMbuqtDSHbS082XBA2kKW9jCMLXeprmkxI=",
"owner": "DreamMaoMao", "owner": "DreamMaoMao",
"repo": "hycov", "repo": "hycov",
"rev": "115cba558d439cc25d62ce38b7c62cde83f50ef5", "rev": "3d144a79f8b5468656de88a005be55f3317d295b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "DreamMaoMao", "owner": "DreamMaoMao",
"repo": "hycov", "repo": "hycov",
"rev": "115cba558d439cc25d62ce38b7c62cde83f50ef5", "rev": "3d144a79f8b5468656de88a005be55f3317d295b",
"type": "github" "type": "github"
} }
}, },
@ -541,11 +541,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713612213, "lastModified": 1717181720,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -554,51 +554,28 @@
"type": "github" "type": "github"
} }
}, },
"hyprgrass": {
"inputs": {
"hyprland": [
"hyprland"
]
},
"locked": {
"lastModified": 1715969899,
"narHash": "sha256-NDURZAbLIihUHNt5a8PGrgmzFkcBsG5e4MgwJE/InbM=",
"owner": "horriblename",
"repo": "hyprgrass",
"rev": "6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917",
"type": "github"
},
"original": {
"owner": "horriblename",
"repo": "hyprgrass",
"rev": "6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917",
"type": "github"
}
},
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems", "systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1714837352, "lastModified": 1718029386,
"narHash": "sha256-UxpPPS5uiyE4FDO3trfJObOm6sE7jnkVguHH6IdkQqs=", "narHash": "sha256-iX/l3UT8iXu8psu2UirFX11Yg2zYwpgzoXB32oM3N3U=",
"rev": "cba1ade848feac44b2eda677503900639581c3f4", "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f",
"revCount": 4606, "revCount": 4794,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
}, },
"original": { "original": {
"rev": "cba1ade848feac44b2eda677503900639581c3f4", "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f",
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -609,6 +586,11 @@
"hyprland": [ "hyprland": [
"hyprland" "hyprland"
], ],
"nixpkgs": [
"hyprland-plugins",
"hyprland",
"nixpkgs"
],
"systems": [ "systems": [
"hyprland-plugins", "hyprland-plugins",
"hyprland", "hyprland",
@ -616,17 +598,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714862850, "lastModified": 1718111105,
"narHash": "sha256-j1DPSl7FMy3JeWpmzXxcmZhxXbIOfteTozSfqtZ7KBQ=", "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "fd133914bf1921db2a26627698f914478f6a9471", "rev": "151102b7d7c4f61ff42f275e72008d28318dac96",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "fd133914bf1921db2a26627698f914478f6a9471", "rev": "151102b7d7c4f61ff42f275e72008d28318dac96",
"type": "github" "type": "github"
} }
}, },
@ -634,10 +616,12 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"xdph",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"hyprland", "hyprland",
"xdph",
"systems" "systems"
] ]
}, },
@ -667,11 +651,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713121246, "lastModified": 1716473782,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "rev": "87d5d984109c839482b88b4795db073eb9ed446f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -692,11 +676,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714755542, "lastModified": 1717784906,
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +785,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717974879, "lastModified": 1718160348,
"narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -877,6 +861,21 @@
"type": "github" "type": "github"
} }
}, },
"nwg-dock-hyprland-pin-nixpkgs": {
"locked": {
"lastModified": 1716385560,
"narHash": "sha256-xuFXyvvrDXx5A56uo8D+YmHqsmPscsjBh279P44Z5bE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15",
"type": "github"
},
"original": {
"id": "nixpkgs",
"rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15",
"type": "indirect"
}
},
"ob-racket": { "ob-racket": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1110,7 +1109,6 @@
"home-manager-stable": "home-manager-stable", "home-manager-stable": "home-manager-stable",
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"hycov": "hycov", "hycov": "hycov",
"hyprgrass": "hyprgrass",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs",
@ -1119,6 +1117,7 @@
"nix-straight": "nix-straight", "nix-straight": "nix-straight",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nwg-dock-hyprland-pin-nixpkgs": "nwg-dock-hyprland-pin-nixpkgs",
"org-krita": "org-krita", "org-krita": "org-krita",
"org-nursery": "org-nursery", "org-nursery": "org-nursery",
"org-side-tree": "org-side-tree", "org-side-tree": "org-side-tree",
@ -1271,23 +1270,6 @@
"type": "github" "type": "github"
} }
}, },
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1713731601,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
}
},
"ws-butler": { "ws-butler": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1306,10 +1288,7 @@
}, },
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": "hyprland-protocols",
"hyprland",
"hyprland-protocols"
],
"hyprlang": [ "hyprlang": [
"hyprland", "hyprland",
"hyprlang" "hyprlang"
@ -1324,11 +1303,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714060055, "lastModified": 1716290197,
"narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View file

@ -86,6 +86,10 @@
system = systemSettings.system; system = systemSettings.system;
}; };
pkgs-nwg-dock-hyprland = import inputs.nwg-dock-hyprland-pin-nixpkgs {
system = systemSettings.system;
};
# configure lib # configure lib
# use nixpkgs if running a server (homelab or worklab profile) # use nixpkgs if running a server (homelab or worklab profile)
# otherwise use patched nixos-unstable nixpkgs # otherwise use patched nixos-unstable nixpkgs
@ -125,6 +129,7 @@
inherit pkgs-stable; inherit pkgs-stable;
inherit pkgs-emacs; inherit pkgs-emacs;
inherit pkgs-kdenlive; inherit pkgs-kdenlive;
inherit pkgs-nwg-dock-hyprland;
inherit systemSettings; inherit systemSettings;
inherit userSettings; inherit userSettings;
inherit inputs; inherit inputs;
@ -175,6 +180,7 @@
nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-stable.url = "nixpkgs/nixos-23.11";
emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6";
kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94";
nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15";
home-manager-unstable.url = "github:nix-community/home-manager/master"; home-manager-unstable.url = "github:nix-community/home-manager/master";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs";
@ -186,15 +192,16 @@
type = "git"; type = "git";
url = "https://github.com/hyprwm/Hyprland"; url = "https://github.com/hyprwm/Hyprland";
submodules = true; submodules = true;
rev = "cba1ade848feac44b2eda677503900639581c3f4"; rev = "ea2501d4556f84d3de86a4ae2f4b22a474555b9f";
}; };
hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland-plugins.url = "github:hyprwm/hyprland-plugins/fd133914bf1921db2a26627698f914478f6a9471"; hyprland-plugins.url = "github:hyprwm/hyprland-plugins/151102b7d7c4f61ff42f275e72008d28318dac96";
hyprland-plugins.inputs.hyprland.follows = "hyprland"; hyprland-plugins.inputs.hyprland.follows = "hyprland";
hycov.url = "github:DreamMaoMao/hycov/115cba558d439cc25d62ce38b7c62cde83f50ef5"; hycov.url = "github:DreamMaoMao/hycov/3d144a79f8b5468656de88a005be55f3317d295b";
hycov.inputs.hyprland.follows = "hyprland"; hycov.inputs.hyprland.follows = "hyprland";
hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917"; # FIXME hyprgrass broken on 0.41.0
hyprgrass.inputs.hyprland.follows = "hyprland"; #hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917";
#hyprgrass.inputs.hyprland.follows = "hyprland";
nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs";

61
user/wm/hyprland/hyprland.nix
View file

@ -1,4 +1,4 @@
{ inputs, config, lib, pkgs, userSettings, systemSettings, ... }: let { inputs, config, lib, pkgs, userSettings, systemSettings, pkgs-nwg-dock-hyprland, ... }: let
pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}; pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in in
{ {
@ -29,7 +29,8 @@ in
plugins = [ plugins = [
inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails
inputs.hycov.packages.${pkgs.system}.hycov inputs.hycov.packages.${pkgs.system}.hycov
inputs.hyprgrass.packages.${pkgs.system}.default # FIXME hypgrass currently broken on 0.41.0
#inputs.hyprgrass.packages.${pkgs.system}.default
]; ];
settings = { }; settings = { };
extraConfig = '' extraConfig = ''
@ -86,9 +87,7 @@ in
general { general {
layout = master layout = master
cursor_inactive_timeout = 30
border_size = 5 border_size = 5
no_cursor_warps = false
col.active_border = 0xff'' + config.lib.stylix.colors.base08 + " " + ''0xff'' + config.lib.stylix.colors.base09 + " " + ''0xff'' + config.lib.stylix.colors.base0A + " " + ''0xff'' + config.lib.stylix.colors.base0B + " " + ''0xff'' + config.lib.stylix.colors.base0C + " " + ''0xff'' + config.lib.stylix.colors.base0D + " " + ''0xff'' + config.lib.stylix.colors.base0E + " " + ''0xff'' + config.lib.stylix.colors.base0F + " " + ''270deg col.active_border = 0xff'' + config.lib.stylix.colors.base08 + " " + ''0xff'' + config.lib.stylix.colors.base09 + " " + ''0xff'' + config.lib.stylix.colors.base0A + " " + ''0xff'' + config.lib.stylix.colors.base0B + " " + ''0xff'' + config.lib.stylix.colors.base0C + " " + ''0xff'' + config.lib.stylix.colors.base0D + " " + ''0xff'' + config.lib.stylix.colors.base0E + " " + ''0xff'' + config.lib.stylix.colors.base0F + " " + ''270deg
col.inactive_border = 0xaa'' + config.lib.stylix.colors.base02 + '' col.inactive_border = 0xaa'' + config.lib.stylix.colors.base02 + ''
@ -98,6 +97,11 @@ in
gaps_out = 7 gaps_out = 7
} }
cursor {
no_warps = false
inactive_timeout = 30
}
plugin { plugin {
hyprtrails { hyprtrails {
color = rgba(''+config.lib.stylix.colors.base08+''55) color = rgba(''+config.lib.stylix.colors.base08+''55)
@ -125,32 +129,33 @@ in
show_special = 0 # show windwos in special workspace in overview. show_special = 0 # show windwos in special workspace in overview.
} }
touch_gestures { # FIXME hypgrass currently broken on 0.41.0 :(
sensitivity = 4.0 #touch_gestures {
long_press_delay = 260 # sensitivity = 4.0
hyprgrass-bind = , edge:r:l, exec, hyprnome # long_press_delay = 260
hyprgrass-bind = , edge:l:r, exec, hyprnome --previous # hyprgrass-bind = , edge:r:l, exec, hyprnome
hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper # hyprgrass-bind = , edge:l:r, exec, hyprnome --previous
# hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper
hyprgrass-bind = , swipe:3:u, hycov:toggleoverview # hyprgrass-bind = , swipe:3:u, hycov:toggleoverview
hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper
hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous # hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous
hyprgrass-bind = , swipe:3:r, exec, hyprnome # hyprgrass-bind = , swipe:3:r, exec, hyprnome
hyprgrass-bind = , swipe:4:u, movewindow,u # hyprgrass-bind = , swipe:4:u, movewindow,u
hyprgrass-bind = , swipe:4:d, movewindow,d # hyprgrass-bind = , swipe:4:d, movewindow,d
hyprgrass-bind = , swipe:4:l, movewindow,l # hyprgrass-bind = , swipe:4:l, movewindow,l
hyprgrass-bind = , swipe:4:r, movewindow,r # hyprgrass-bind = , swipe:4:r, movewindow,r
hyprgrass-bind = , tap:3, fullscreen,1 # hyprgrass-bind = , tap:3, fullscreen,1
hyprgrass-bind = , tap:4, fullscreen,0 # hyprgrass-bind = , tap:4, fullscreen,0
hyprgrass-bindm = , longpress:2, movewindow # hyprgrass-bindm = , longpress:2, movewindow
hyprgrass-bindm = , longpress:3, resizewindow # hyprgrass-bindm = , longpress:3, resizewindow
} #}
} }
bind=SUPER,SUPER_L,exec,nwggrid-wrapper bind=SUPER,SUPER_L,exec,nwggrid-wrapper
@ -389,9 +394,6 @@ in
feh feh
killall killall
polkit_gnome polkit_gnome
(nwg-dock-hyprland.overrideAttrs (oldAttrs: {
patches = ./patches/noactiveclients.patch;
}))
nwg-launchers nwg-launchers
papirus-icon-theme papirus-icon-theme
(pkgs.writeScriptBin "nwggrid-wrapper" '' (pkgs.writeScriptBin "nwggrid-wrapper" ''
@ -538,7 +540,12 @@ in
type = "Application"; type = "Application";
})]) })])
++ ++
(with pkgs-hyprland; [ hyprlock ]); (with pkgs-hyprland; [ hyprlock ])
++ (with pkgs-nwg-dock-hyprland; [
(nwg-dock-hyprland.overrideAttrs (oldAttrs: {
patches = ./patches/noactiveclients.patch;
}))
]);
home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source = home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source =
config.lib.stylix.colors { config.lib.stylix.colors {
template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache; template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache;