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

FEAT: switched to wayland

Browse source
This commit is contained in:
Patrick Großmann 2023-03-12 13:55:04 +09:00
parent 243177409e
commit 78e85a399d
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
7 changed files with 77 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configuration.nix
View file

@ -19,7 +19,7 @@ in {
./modules/smb-mounts.nix ./modules/smb-mounts.nix
./modules/networking.nix ./modules/networking.nix
./modules/nix.nix ./modules/nix.nix
./modules/xserver.nix #./modules/xserver.nix
./modules/hyprland.nix ./modules/hyprland.nix
]; ];
@ -35,6 +35,10 @@ in {
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "C.UTF-8"; i18n.defaultLocale = "C.UTF-8";
services.xserver = {
layout = "de";
xkbVariant = "bone";
};
console = { console = {
font = "ter-v28n"; font = "ter-v28n";
packages = with pkgs; [terminus_font]; packages = with pkgs; [terminus_font];
@ -109,6 +113,8 @@ in {
# and env variables will be loaded incorrectly # and env variables will be loaded incorrectly
programs.zsh.enable = true; programs.zsh.enable = true;
services.physlock.enable = true;
programs.steam = { programs.steam = {
enable = true; enable = true;
package = pkgs.steam.override { package = pkgs.steam.override {

90
data/hyprland/config.nix
View file

@ -1,60 +1,66 @@
MOD: TAGS: pkgs: MOD: TAGS: pkgs:
'' ''
general { general {
gaps_in = 1 gaps_in = 1
gaps_out = 0 gaps_out = 0
}
input {
sensitivity = 0
kb_model = pc105
kb_layout = de
kb_variant = bone
repeat_rate = 60
repeat_delay = 235
# Only change focus on mouse click
follow_mouse = 2
touchpad {
natural_scroll = true
} }
}
input { # keybinds
sensitivity = -0.8 bind=${MOD},q,killactive,
kb_model = pc105 bind=${MOD},return,fullscreen,
kb_layout = de bind=${MOD},f,togglefloating
kb_variant = bone bind=${MOD},tab,cyclenext,
repeat_rate = 60 bind=ALT,tab,cyclenext,
repeat_delay = 235 bind=,Menu,exec,rofi -show drun
# Only change focus on mouse click
follow_mouse = 2
}
# 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},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
'' ''
+ builtins.concatStringsSep "\n" (map ( + builtins.concatStringsSep "\n" (map (
x: '' x: ''
bind=${MOD},${x},workspace,${x} bind=${MOD},${x.fst},workspace,${x.snd}
bind=${MOD} + Shift,${x},movetoworkspace,${x} bind=${MOD} + SHIFT,${x.fst},movetoworkspace,${x.snd}
'' ''
) )
TAGS) (pkgs.lib.lists.zipLists (map toString (pkgs.lib.lists.range 1 9)) TAGS))

28
flake.lock
View file

@ -103,11 +103,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1678271387, "lastModified": 1678571066,
"narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", "narHash": "sha256-MrlMr2A3tK1MY/JUGWMVzMwois8+mHWXm/1yYdwQSIc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", "rev": "bf5712c5865e543fb3f4796511d4cf51efd841b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +124,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1678268777, "lastModified": 1678557514,
"narHash": "sha256-nIRic657abSyBAQ5V3bOOE0aPbjAZx2wvr9mPRoq1cQ=", "narHash": "sha256-yNrik47cr8qPgl6zTMNJSfoC2zKZJaNUQAMWFYTajcE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "92d2331170ce738056ad6bc63fa346174b954f66", "rev": "71ef1bde7e45f94ceaab925ae065f32f91510890",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1678293141, "lastModified": 1678470307,
"narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=", "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d", "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1677832802, "lastModified": 1678376203,
"narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "382bee738397ca005206eefa36922cc10df8a21c", "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,11 +247,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-b3t2blYgmHf/HXc152Fa7+YKJSS05vRnrs8i+H6SWA8=", "narHash": "sha256-b3t2blYgmHf/HXc152Fa7+YKJSS05vRnrs8i+H6SWA8=",
"path": "/nix/store/8snyk21w4xs6v6kn1pjhs7n7b7j8s29i-source/templates", "path": "/nix/store/cp64wcr7y55dlaamgq4axbhzhw2pqwhd-source/templates",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/8snyk21w4xs6v6kn1pjhs7n7b7j8s29i-source/templates", "path": "/nix/store/cp64wcr7y55dlaamgq4axbhzhw2pqwhd-source/templates",
"type": "path" "type": "path"
} }
}, },

3
modules/xserver.nix
View file

@ -3,8 +3,6 @@
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.startx.enable = true; displayManager.startx.enable = true;
layout = "de";
xkbVariant = "bone";
autoRepeatDelay = 235; autoRepeatDelay = 235;
autoRepeatInterval = 60; autoRepeatInterval = 60;
videoDrivers = ["modesetting"]; videoDrivers = ["modesetting"];
@ -20,5 +18,4 @@
}; };
}; };
services.autorandr.enable = true; services.autorandr.enable = true;
services.physlock.enable = true;
} }

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

@ -4,7 +4,7 @@
... ...
}: let }: let
MOD = "SUPER"; MOD = "SUPER";
TAGS = map toString (lib.lists.range 1 9); TAGS = map toString (lib.lists.range 42 50);
in { in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;

3
users/common/programs/rofi.nix
View file

@ -1,6 +1,7 @@
_: { {pkgs, ...}: {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland;
theme = "DarkBlue"; theme = "DarkBlue";
extraConfig = { extraConfig = {
matching = "fuzzy"; matching = "fuzzy";

12
users/patrick.nix
View file

@ -5,13 +5,13 @@
}: { }: {
imports = [ imports = [
common/programs/kitty.nix common/programs/kitty.nix
common/graphical/herbstluftwm.nix #common/graphical/herbstluftwm.nix
common/graphical/hyprland.nix common/graphical/hyprland.nix
common/graphical/autorandr.nix #common/graphical/autorandr.nix
common/programs/polybar.nix common/programs/polybar.nix
common/programs/rofi.nix common/programs/rofi.nix
common/touchegg-module.nix #common/touchegg-module.nix
common/touchegg-settings.nix #common/touchegg-settings.nix
]; ];
home = { home = {
@ -21,7 +21,7 @@
bitwarden bitwarden
nextcloud-client nextcloud-client
signal-desktop signal-desktop
spotify spotify-tui
xdragon xdragon
xournalpp xournalpp
zathura zathura
@ -55,8 +55,6 @@
height: 32px !important; height: 32px !important;
} }
''; '';
search.default = "Kagi";
search.force = true;
}; };
}; };