patrick/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Wiki Activity

chor: System update

Browse source
This commit is contained in:
Patrick Großmann 2023-04-12 23:52:20 +09:00
parent 36a7cfc28c
commit 60228a141c
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
7 changed files with 112 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configuration.nix
View file

@ -19,7 +19,6 @@ in {
./modules/networking.nix ./modules/networking.nix
./modules/nix.nix ./modules/nix.nix
#./modules/xserver.nix #./modules/xserver.nix
./modules/hyprland.nix
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -38,6 +37,7 @@ in {
layout = "de"; layout = "de";
xkbVariant = "bone"; xkbVariant = "bone";
}; };
programs.hyprland.enable = true;
console = { console = {
font = "ter-v28n"; font = "ter-v28n";
packages = with pkgs; [terminus_font]; packages = with pkgs; [terminus_font];

110
data/hyprland/config.nix
View file

@ -1,73 +1,77 @@
MOD: TAGS: pkgs: MOD: TAGS: pkgs:
'' ''
general { general {
gaps_in = 1 gaps_in = 1
gaps_out = 0 gaps_out = 0
}
input {
sensitivity = 0
kb_layout = de,de
kb_variant = bone,
repeat_rate = 60
repeat_delay = 235
# Only change focus on mouse click
follow_mouse = 2
accel_profile = flat
touchpad {
natural_scroll = true
} }
}
input { gestures {
sensitivity = 0 workspace_swipe = true
kb_layout = de,de }
kb_variant = bone,
repeat_rate = 60
repeat_delay = 235
# Only change focus on mouse click
follow_mouse = 2
accel_profile = flat
touchpad {
natural_scroll = true
}
}
gestures { misc {
workspace_swipe = true disable_hyprland_logo = true
} }
misc { # keybinds
disable_hyprland_logo = true bind=${MOD},q,killactive,
} bind=${MOD},return,fullscreen,
bind=${MOD},f,togglefloating
bind=${MOD},tab,cyclenext,
bind=ALT,tab,cyclenext,
bind=,Menu,exec,rofi -show drun
# keybinds bind=${MOD},left,movefocus,l
bind=${MOD},q,killactive, bind=${MOD},right,movefocus,r
bind=${MOD},return,fullscreen, bind=${MOD},up,movefocus,u
bind=${MOD},f,togglefloating bind=${MOD},down,movefocus,d
bind=${MOD},tab,cyclenext,
bind=ALT,tab,cyclenext,
bind=,Menu,exec,rofi -show drun
bind=${MOD},left,movefocus,l bind=${MOD},n,movefocus,l
bind=${MOD},right,movefocus,r bind=${MOD},s,movefocus,r
bind=${MOD},up,movefocus,u bind=${MOD},l,movefocus,u
bind=${MOD},down,movefocus,d bind=${MOD},r,movefocus,d
bind=${MOD},n,movefocus,l bind=${MOD} + SHIFT,left,movewindow,l
bind=${MOD},s,movefocus,r bind=${MOD} + SHIFT,right,movewindow,r
bind=${MOD},l,movefocus,u bind=${MOD} + SHIFT,up,movewindow,u
bind=${MOD},r,movefocus,d bind=${MOD} + SHIFT,down,movewindow,d
bind=${MOD} + SHIFT,left,movewindow,l bind=${MOD} + SHIFT,n,movewindow,l
bind=${MOD} + SHIFT,right,movewindow,r bind=${MOD} + SHIFT,s,movewindow,r
bind=${MOD} + SHIFT,up,movewindow,u bind=${MOD} + SHIFT,l,movewindow,u
bind=${MOD} + SHIFT,down,movewindow,d bind=${MOD} + SHIFT,r,movewindow,d
bind=${MOD} + SHIFT,n,movewindow,l bind=${MOD},comma,workspace,-1
bind=${MOD} + SHIFT,s,movewindow,r bind=${MOD},period,workspace,+1
bind=${MOD} + SHIFT,l,movewindow,u
bind=${MOD} + SHIFT,r,movewindow,d
bind=${MOD},comma,workspace,-1
bind=${MOD},period,workspace,+1
bind=${MOD},b,exec,firefox bind=${MOD},b,exec,firefox
bind=${MOD},t,exec,kitty bind=${MOD},t,exec,kitty
bind=${MOD} + SHIFT,Escape,exit bind=${MOD} + SHIFT,Escape,exit
#fix xwayland hidpi
exec-once = xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2
env = GDK_SCALE,2
env = XCURSOR_SIZE,48
workspace = eDP-1, 42 workspace = eDP-1, 42
exec-once=bash -c "waybar >/tmp/waybar_error.log" exec-once=bash -c "waybar >/tmp/waybar_error.log"
'' ''
+ builtins.concatStringsSep "\n" (map ( + builtins.concatStringsSep "\n" (map (
x: '' x: ''

84
flake.lock
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677969766, "lastModified": 1680281360,
"narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", "rev": "e64961977f60388dd0b49572bb0fc453b871f896",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,12 +60,15 @@
} }
}, },
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1678901627, "lastModified": 1681202837,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +106,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1680114304, "lastModified": 1681250798,
"narHash": "sha256-XymtLu8G2nzenjDUWI7XV2MMHztvPkEZUFpwmZFcxVM=", "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e065e1b6f0776ebbacea9dcbc977af7bc9eddc0", "rev": "28698126bd825aff21cae9ffd15cf83e169051b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +127,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1680132864, "lastModified": 1681303095,
"narHash": "sha256-KcgGLM0za/04IFKz0Afz/T1NGUWhmnSJDTIip/CzNOo=", "narHash": "sha256-0lj5ZGMhXdeYbbQQ5Y0fv0OcKe0zXfn4H2VOn31l/9o=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "b88de63abb41bfb8c07638e6277982503638c29d", "rev": "efee6a1cda278b8589bfe335c66d8fb272027bca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +148,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671839510, "lastModified": 1681065697,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +163,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679172431, "lastModified": 1680669251,
"narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +195,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1679944645, "lastModified": 1681217261,
"narHash": "sha256-e5Qyoe11UZjVfgRfwNoSU57ZeKuEmjYb77B9IVW7L/M=", "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bb072f0a8b267613c127684e099a70e1f6ff106", "rev": "3fb8eedc450286d5092e4953118212fa21091b3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +222,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1678976941, "lastModified": 1681227715,
"narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=", "narHash": "sha256-kQZOoTa177VF5uk1JK7bA9ZTU5g6d5IuDp/6YdxUWao=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e", "rev": "c77e64a5adab96866ea97449a5a7a327d4629828",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,6 +246,21 @@
"templates": "templates" "templates": "templates"
} }
}, },
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"templates": { "templates": {
"locked": { "locked": {
"lastModified": 1679299625, "lastModified": 1679299625,
@ -260,11 +278,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1678901627,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -277,11 +295,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1679340088, "lastModified": 1680810405,
"narHash": "sha256-/1KiYoBivDj8HC/eVK2Tr2WYkVdKJxq2Lb0tQs0qqJo=", "narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "1d64e12391a638201c679e71d4e22bb45e5faa8e", "rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -303,11 +321,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673116118, "lastModified": 1681127512,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -62,7 +62,6 @@
templates.flake = templates; templates.flake = templates;
}; };
} }
hyprland.nixosModules.default
]; ];
}; };
} }

8
modules/hyprland.nix
View file

@ -1,8 +0,0 @@
{pkgs, ...}: {
programs.hyprland = {
enable = true;
# Users should provide their own package
package = null;
};
xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr];
}

1
users/common/graphical/hyprland.nix
View file

@ -56,6 +56,7 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.hidpi = true;
nvidiaPatches = true; nvidiaPatches = true;
extraConfig = import ../../../data/hyprland/config.nix MOD TAGS pkgs; extraConfig = import ../../../data/hyprland/config.nix MOD TAGS pkgs;
}; };

4
users/common/shells/zsh.nix
View file

@ -45,8 +45,8 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "zdharma-continuum"; owner = "zdharma-continuum";
repo = "fast-syntax-highlighting"; repo = "fast-syntax-highlighting";
rev = "371591a7b6f0f3c9501c52a7b566addbfd804d09"; rev = "13d7b4e63468307b6dcb2dadf6150818f242cbff";
sha256 = "125kp7rzq9yf565h6crkr8fyvrz867jjwlx0w2dbhas9p1id978l"; sha256 = "0ghzqg1xfvqh9z23aga7aafrpxbp9bpy1r8vk4avi6b80p3iwsq2";
}; };
} }
]; ];