rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-01-31 09:55:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

hyprland tweaks

Browse source
This commit is contained in:
Rouven Seifert 2023-03-04 21:22:42 +01:00
parent 49fa6f0b7e
commit 6454f8c69c
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
6 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
flake.lock generated
View file

@ -77,19 +77,23 @@
}, },
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": [
"hyprland-protocols"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": [
"xdph"
]
}, },
"locked": { "locked": {
"lastModified": 1677778250, "lastModified": 1677946956,
"narHash": "sha256-OBDL8u2bO83GqX8BTiLkop1fKg4fZKt0zozO9hfTBns=", "narHash": "sha256-5kzTfzNVzN/VOssGfNko5O2BTYciWSKlqb+q7oX1lh4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "34685a836a40648167848060b48b62788cdcc85f", "rev": "5184b542b1f505c90f9ef4715ae949ac45b2b7ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,16 +105,15 @@
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1671839510, "lastModified": 1673631087,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", "narHash": "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", "rev": "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +163,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1677591639, "lastModified": 1677949148,
"narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=", "narHash": "sha256-dEdcn+UYs8TUK3VTNCQk9TsJapJLEq50A4q7eC3/PTU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce", "rev": "d63e86cbed3d399c4162594943bd8c1d8392e550",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,12 +276,14 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-protocols": "hyprland-protocols",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixvim": "nixvim", "nixvim": "nixvim",
"sops-nix": "sops-nix" "sops-nix": "sops-nix",
"xdph": "xdph"
} }
}, },
"sops-nix": { "sops-nix": {
@ -336,11 +341,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1675374853, "lastModified": 1677789111,
"narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", "narHash": "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", "rev": "5ae17de23f5fd9bb252a698f3771c840280e2c05",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -353,20 +358,18 @@
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [
"hyprland",
"hyprland-protocols" "hyprland-protocols"
], ],
"nixpkgs": [ "nixpkgs": [
"hyprland",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1673116118, "lastModified": 1676131170,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", "narHash": "sha256-K2KLGfUHbasZQCeXTRIZMYcEEnW2exBXvJiXRmJZibM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", "rev": "2fa7e345a4131fb9bddb5dc168475613c0684cf5",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View file

@ -7,17 +7,24 @@
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
nix-colors.url = github:Misterio77/nix-colors; nix-colors.url = github:Misterio77/nix-colors;
hyprpaper.url = github:hyprwm/hyprpaper; hyprpaper.url = github:hyprwm/hyprpaper;
hyprland-protocols.url = github:hyprwm/hyprland-protocols;
xdph.url = github:hyprwm/xdg-desktop-portal-hyprland;
nixos-hardware.url = github:nixos/nixos-hardware; nixos-hardware.url = github:nixos/nixos-hardware;
nixvim.url = github:pta2002/nixvim; nixvim.url = github:pta2002/nixvim;
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland.inputs.hyprland-protocols.follows = "hyprland-protocols";
hyprland.inputs.xdph.follows = "xdph";
hyprpaper.inputs.nixpkgs.follows = "nixpkgs"; hyprpaper.inputs.nixpkgs.follows = "nixpkgs";
hyprland-protocols.inputs.nixpkgs.follows = "nixpkgs";
xdph.inputs.nixpkgs.follows = "nixpkgs";
xdph.inputs.hyprland-protocols.follows = "hyprland-protocols";
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nixvim.inputs.nixpkgs.follows = "nixpkgs"; nixvim.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, sops-nix, nix-colors, nixos-hardware, nixvim }@attrs: { outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, xdph, sops-nix, nix-colors, nixos-hardware, nixvim, ... }@attrs: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = { nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem { thinkpad = nixpkgs.lib.nixosSystem {

12
hosts/thinkpad/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, inputs, ... }:
{ {
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -27,8 +27,7 @@
keyMap = "dvorak"; keyMap = "dvorak";
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
colors = colors =
let let colors = config.home-manager.users.rouven.colorScheme.colors;
colors = config.home-manager.users.rouven.colorScheme.colors;
in in
[ [
colors.base00 colors.base00
@ -70,7 +69,12 @@
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
}; };
xdg.portal.wlr.enable = true; xdg.portal = {
enable = true;
extraPortals = [
inputs.xdph.packages.x86_64-linux.default
];
};
programs.dconf.enable = true; programs.dconf.enable = true;

12
users/rouven/modules/hyprland/default.nix
View file

@ -1,9 +1,15 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
./hyprpaper.nix ./session.nix ./waybar.nix ./hyprpaper.nix
./session.nix
./waybar.nix
]; ];
wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland = {
enable = true;
extraConfig = builtins.readFile ./hyprland.conf; # todo nix config when available
};
home.sessionVariables = { home.sessionVariables = {
GRIM_DEFAULT_DIR = "~/Pictures/Screenshots/"; GRIM_DEFAULT_DIR = "~/Pictures/Screenshots/";
}; };
@ -19,8 +25,6 @@
]; ];
xdg.configFile = { xdg.configFile = {
"hypr/hyprland.conf".source = ./hyprland.conf;
"wofi/config".text = '' "wofi/config".text = ''
allow_images = true allow_images = true
term = alacritty term = alacritty

5
users/rouven/modules/hyprland/hyprland.conf
View file

@ -1,10 +1,5 @@
# See https://wiki.hyprland.org/Configuring/Monitors/ # See https://wiki.hyprland.org/Configuring/Monitors/
monitor=eDP-1, 1920x1080, 0x0, 1 monitor=eDP-1, 1920x1080, 0x0, 1
# manually start the systemd target
exec-once = systemctl --user start hyprland-session.target
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input { input {
kb_layout = us kb_layout = us

1
users/rouven/modules/packages.nix
View file

@ -68,6 +68,7 @@
}) })
]; ];
programs.obs-studio.enable = true;
xdg.mimeApps = { xdg.mimeApps = {
enable = true; enable = true;