kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try out hyprland again and waybar changes

Browse Source
This commit is contained in:
Kopatz
2024-07-24 18:10:22 +02:00
parent c304dad5c5
commit 45d93bc672
10 changed files with 333 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
flake.lock generated
View File

@@ -21,6 +21,39 @@
"type": "github" "type": "github"
} }
}, },
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721755137,
"narHash": "sha256-DcJkFNaHGRMIkexx/ol2oNiUFT/zqnZH6dwODdHubIU=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "4c72cd4d0b0368ce78bf94ea7f23d47670f0d429",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"base16": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@@ -318,7 +351,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@@ -336,7 +369,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
@@ -542,6 +575,168 @@
"type": "github" "type": "github"
} }
}, },
"hyprcursor": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721330371,
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"systems": "systems_3",
"xdph": "xdph"
},
"locked": {
"lastModified": 1721831547,
"narHash": "sha256-ueSN0oXsQ9aqA8CGBaJULXxYWap8Zchdp8wzgWTzQe4=",
"ref": "refs/heads/main",
"rev": "8d3920c882f0587c5b3224135f668dce8bb0b04f",
"revCount": 4973,
"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",
"xdph",
"nixpkgs"
],
"systems": [
"hyprland",
"xdph",
"systems"
]
},
"locked": {
"lastModified": 1718746314,
"narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "1b61f0093afff20ab44d88ad707aed8bf2215290",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721324361,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721324102,
"narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "962582a090bc233c4de9d9897f46794280288989",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721324119,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"nix-colors": { "nix-colors": {
"inputs": { "inputs": {
"base16-schemes": "base16-schemes", "base16-schemes": "base16-schemes",
@@ -705,6 +900,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1721379653,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1721548954, "lastModified": 1721548954,
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
@@ -720,7 +931,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1714912032, "lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@@ -785,11 +996,12 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"hyprland": "hyprland",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
@@ -808,7 +1020,7 @@
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_4", "home-manager": "home-manager_4",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1721573849, "lastModified": 1721573849,
@@ -855,6 +1067,21 @@
} }
}, },
"systems_3": { "systems_3": {
"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"
}
},
"systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -869,7 +1096,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": { "systems_5": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -904,6 +1131,36 @@
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721648131,
"narHash": "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "663be9cad424b170b28b9fa8a61042d721007f3b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

20
flake.nix
View File

@@ -32,6 +32,7 @@
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
}; };
outputs = { self, nur, nixpkgs, nixos-hardware, nixos-wsl, nixpkgs-unstable outputs = { self, nur, nixpkgs, nixos-hardware, nixos-wsl, nixpkgs-unstable
, agenix, home-manager, home-manager-unstable, nix-colors, nixos-cosmic , agenix, home-manager, home-manager-unstable, nix-colors, nixos-cosmic
@@ -56,11 +57,9 @@
let lib = specialArgs.pkgsVersion.lib; let lib = specialArgs.pkgsVersion.lib;
in specialArgs.pkgsVersion.lib.nixosSystem { in specialArgs.pkgsVersion.lib.nixosSystem {
inherit system; inherit system;
modules = modules ++ [ modules = modules
./modules ++ [ ./modules agenix.nixosModules.default overlays ]
agenix.nixosModules.default ++ lib.lists.optionals (!minimal)
overlays
] ++ lib.lists.optionals (!minimal)
[ specialArgs.home-manager-version.nixosModules.home-manager ] [ specialArgs.home-manager-version.nixosModules.home-manager ]
++ lib.lists.optionals (!minimal && graphical) [ ++ lib.lists.optionals (!minimal && graphical) [
./modules/graphical ./modules/graphical
@@ -79,11 +78,9 @@
let lib = specialArgs.pkgsVersion.lib; let lib = specialArgs.pkgsVersion.lib;
in specialArgs.pkgsVersion.lib.nixosSystem { in specialArgs.pkgsVersion.lib.nixosSystem {
inherit system; inherit system;
modules = modules ++ [ modules = modules
./modules ++ [ ./modules agenix.nixosModules.default overlays ]
agenix.nixosModules.default ++ lib.lists.optionals (!minimal)
overlays
] ++ lib.lists.optionals (!minimal)
[ specialArgs.home-manager-version.nixosModules.home-manager ]; [ specialArgs.home-manager-version.nixosModules.home-manager ];
specialArgs = specialArgs // { inherit inputs outputs; }; specialArgs = specialArgs // { inherit inputs outputs; };
}; };
@@ -160,7 +157,8 @@
]; ];
}; };
# build vm -> nixos-rebuild build-vm --flake .#vm # build vm -> nixos-rebuild build-vm --flake .#vm
"vm" = mkHost { modules = [ ./users/vm ./systems/vm/configuration.nix ]; }; "vm" =
mkHost { modules = [ ./users/vm ./systems/vm/configuration.nix ]; };
}; };
}; };
} }

3
home-manager/hyprland/hyprland-settings.nix
View File

@@ -7,7 +7,6 @@ in {
enable = true; enable = true;
#enableNvidiaPatches = true; #enableNvidiaPatches = true;
xwayland.enable = true; xwayland.enable = true;
package = pkgs.hyprland;
settings = { settings = {
# #
# Please note not all available settings / options are set here. # Please note not all available settings / options are set here.
@@ -290,7 +289,9 @@ in {
bind = , escape, submap, reset bind = , escape, submap, reset
submap = reset submap = reset
''; '';
#experimental:explicit_sync = true
}; };
}; };
} }

2
home-manager/hyprland/styles/stats.css
View File

@@ -2,7 +2,7 @@
#other-drawer, #other-drawer,
#stats, #stats,
#stats-drawer { #stats-drawer {
margin: 0.5em; margin: 0 0.5em;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
color: @peach; color: @peach;

6
home-manager/hyprland/styles/style.css
View File

@@ -64,10 +64,16 @@ box {
} }
/* Add spacing for right side modules */ /* Add spacing for right side modules */
#pulseaudio, #pulseaudio,
#mpris,
#backlight { #backlight {
padding: 0 0.5em; padding: 0 0.5em;
} }
#mpris {
font-size: 12px;
color: @text;
}
#battery.charging, #battery.charging,
#battery.plugged, #battery.plugged,
#battery.full #battery.full

2
home-manager/hyprland/styles/workspaces.css
View File

@@ -1,5 +1,5 @@
#workspaces { #workspaces {
margin: 0.5em; margin: 0 0.5em;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
color: @peach; color: @peach;

57
home-manager/hyprland/waybar.nix
View File

@@ -17,7 +17,7 @@ in {
#systemd.target = "sway-session.target"; #systemd.target = "sway-session.target";
settings.main = { settings.main = {
layer = "top"; layer = "top";
position = "top"; position = "bottom";
#output = lib.mapAttrsToList (n: v: v.monitor) outputs; #output = lib.mapAttrsToList (n: v: v.monitor) outputs;
height = 25; height = 25;
spacing = 4; spacing = 4;
@@ -27,6 +27,15 @@ in {
]; ];
modules-center = [ ]; modules-center = [ ];
modules-right = [ "group/stats" "group/other" ]; modules-right = [ "group/stats" "group/other" ];
"group/stats" = {
"orientation" = "horizontal";
"modules" = [ "network" "cpu" "memory" "disk" "temperature" ];
};
"group/other" = {
"orientation" = "horizontal";
"modules" =
[ "tray" "backlight" "pulseaudio" "mpris" "battery" "clock" ];
};
"cpu" = { "cpu" = {
"format" = " {usage}%"; "format" = " {usage}%";
"tooltip" = true; "tooltip" = true;
@@ -64,11 +73,11 @@ in {
"pulseaudio" = { "pulseaudio" = {
"format" = "{volume}% {icon}"; "format" = "{volume}% {icon}";
"format-bluetooth" = "{volume}% {icon}"; "format-bluetooth" = "{volume}% {icon}";
"format-muted" = "🚫"; "format-muted" = "";
"format-icons" = { "format-icons" = {
"headphone" = ""; "headphone" = " ";
"hands-free" = ""; "hands-free" = " ";
"headset" = ""; "headset" = " ";
"phone" = ""; "phone" = "";
"portable" = ""; "portable" = "";
"car" = ""; "car" = "";
@@ -99,18 +108,36 @@ in {
"battery".states.critical = 15; "battery".states.critical = 15;
"battery".format = "{capacity}% / {power:.2}W {icon}"; "battery".format = "{capacity}% / {power:.2}W {icon}";
"battery".format-icons = [ "" "" "" "" "" ]; "battery".format-icons = [ "" "" "" "" "" ];
"clock".format = "{:%F %H:%M}"; "clock" = {
"clock".tooltip-format = "<tt><small>{calendar}</small></tt>"; format = "{:%F %H:%M}";
tooltip-format = "<tt><small>{calendar}</small></tt>";
"calendar" = {
"mode" = "year";
"mode-mon-col" = 3;
"weeks-pos" = "right";
"on-scroll" = 1;
"format" = {
"months" = "<span color='#ffead3'><b>{}</b></span>";
"days" = "<span color='#ecc6d9'><b>{}</b></span>";
"weeks" = "<span color='#99ffdd'><b>W{}</b></span>";
"weekdays" = "<span color='#ffcc66'><b>{}</b></span>";
"today" = "<span color='#ff6699'><b><u>{}</u></b></span>";
};
};
};
"mpris" = {
"format" = "{player_icon} {dynamic}";
"format-paused" = "{status_icon} <i>{dynamic}</i>";
"title-len" = 35;
"dynamic-len" = 35;
"player-icons" = {
"default" = "▶";
"mpv" = "🎵";
};
"status-icons" = { "paused" = "⏸"; };
};
"tray".icon-size = 21; "tray".icon-size = 21;
"tray".spacing = 10; "tray".spacing = 10;
"group/stats" = {
"orientation" = "horizontal";
"modules" = [ "network" "cpu" "memory" "disk" "temperature" ];
};
"group/other" = {
"orientation" = "horizontal";
"modules" = [ "tray" "backlight" "pulseaudio" "battery" "clock" ];
};
"hyprland/window" = { "hyprland/window" = {
"format" = "{}"; "format" = "{}";
"separate-outputs" = true; "separate-outputs" = true;

6
modules/graphical/hyprland.nix
View File

@@ -32,6 +32,12 @@ in {
__GLX_VENDOR_LIBRARY_NAME = "nvidia"; __GLX_VENDOR_LIBRARY_NAME = "nvidia";
#WLR_BACKENDS="x11,way #WLR_BACKENDS="x11,way
}; };
nix.settings = {
substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
};
hardware = { hardware = {
# Opengl # Opengl

4
modules/hardware/nvidia.nix
View File

@@ -20,7 +20,7 @@ in {
driSupport32Bit = true; driSupport32Bit = true;
}; };
}; };
in lib.mkIf cfg.enable nvidiaOption // { in lib.mkIf cfg.enable (lib.recursiveUpdate nvidiaOption {
boot.kernelParams = [ "nvidia-drm.fbdev=1" ]; boot.kernelParams = [ "nvidia-drm.fbdev=1" ];
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = { hardware.nvidia = {
@@ -45,5 +45,5 @@ in {
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta;
}; };
}; });
} }

1
overlays.nix
View File

@@ -14,6 +14,7 @@
waybar = prev.waybar.overrideAttrs (oldAttrs: { waybar = prev.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
}); });
hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland;
# .png doesnt work :( # .png doesnt work :(
#fastfetch = prev.fastfetch.overrideAttrs (oldAttrs: { #fastfetch = prev.fastfetch.overrideAttrs (oldAttrs: {