joy/nix
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

cleanig

Browse source
This commit is contained in:
joy 2024-09-08 17:04:51 +02:00
parent 02717e7359
commit bf2cdca9dc
5 changed files with 165 additions and 445 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

265
flake.lock
View file

@ -19,39 +19,6 @@
"type": "github" "type": "github"
} }
}, },
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725199881,
"narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"base16": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@ -315,168 +282,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprcursor": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1722623071,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
"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_2",
"xdph": "xdph"
},
"locked": {
"lastModified": 1725752806,
"narHash": "sha256-UwmsA7O9Wofu6YWldyR8NDv1bzxNICIg85/uOrVq69Y=",
"ref": "refs/heads/main",
"rev": "312411fc7073143a8bf1fc3ba23ef403b7d15eee",
"revCount": 5195,
"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": 1721326555,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725188252,
"narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1724966483,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
"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"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718714799, "lastModified": 1718714799,
@ -494,22 +299,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
@ -525,7 +314,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725194671, "lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
@ -546,8 +335,7 @@
"ags": "ags", "ags": "ags",
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"stylix": "stylix" "stylix": "stylix"
} }
}, },
@ -564,8 +352,8 @@
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1725290973, "lastModified": 1725290973,
@ -597,21 +385,6 @@
} }
}, },
"systems_2": { "systems_2": {
"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_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -625,36 +398,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725203932,
"narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

1
flake.nix
View file

@ -12,7 +12,6 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { outputs = {

6
modules/apps/helix/default.nix
View file

@ -1,4 +1,8 @@
{pkgs,lib, ...}: { {
pkgs,
lib,
...
}: {
home-manager.users.joy.programs.helix = { home-manager.users.joy.programs.helix = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;

34
modules/hypr/hyprland/default.nix
View file

@ -1,7 +1,7 @@
{ {pkgs, ...}: {
pkgs, programs.hyprland = {
... enable = true;
}: { };
home-manager.users.joy = { home-manager.users.joy = {
home.packages = with pkgs; [ home.packages = with pkgs; [
rofi-wayland rofi-wayland
@ -16,10 +16,6 @@
playerctl playerctl
]; ];
programs.hyprland = {
enable = true;
};
services.cliphist.enable = true; services.cliphist.enable = true;
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
@ -27,31 +23,25 @@
settings = { settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
"$sciPath" = "~/nix/modules/hypr/hyprland/scripts"; "$sciPath" = "~/nix/modules/hypr/hyprland/scripts";
cursor = { cursor = {
inactive_timeout = "3"; inactive_timeout = "3";
}; };
env = [ env = [
"HYPRCURSOR_THEME = Bibata-Modern-Ice" "HYPRCURSOR_THEME = Bibata-Modern-Ice"
"HYPRCURSOR_SIZE = 24" "HYPRCURSOR_SIZE = 24"
"NIXOS_OZONE_WL = 1" "NIXOS_OZONE_WL = 1"
]; ];
xwayland = { xwayland = {
force_zero_scaling = true; force_zero_scaling = true;
}; };
monitor = [ monitor = [
"DP-1,2560x1440@165.00Hz,auto,1,bitdepth,10" "DP-1,2560x1440@165.00Hz,auto,1,bitdepth,10"
"eDP-1,prefrered,auto,1" "eDP-1,prefrered,auto,1"
"HDMI-A-1,prefrered,auto,1,mirror,eDP-1" "HDMI-A-1,prefrered,auto,1,mirror,eDP-1"
]; ];
exec-once = [ exec-once = [
"ags" "ags"
]; ];
windowrule = [ windowrule = [
"float,title:^(Pipewire)(.*)$" "float,title:^(Pipewire)(.*)$"
"float,title:^(Disks)(.*)$" "float,title:^(Disks)(.*)$"
@ -61,13 +51,11 @@
"float,title:^(Network Connections)(.*)$" "float,title:^(Network Connections)(.*)$"
"opacity 0.9,^(Alacritty)(.*)$" "opacity 0.9,^(Alacritty)(.*)$"
]; ];
gestures = { gestures = {
workspace_swipe = true; workspace_swipe = true;
workspace_swipe_forever = true; workspace_swipe_forever = true;
workspace_swipe_distance = 200; workspace_swipe_distance = 200;
}; };
general = { general = {
gaps_in = 5; gaps_in = 5;
gaps_out = 10; gaps_out = 10;
@ -75,26 +63,21 @@
allow_tearing = false; allow_tearing = false;
layout = "master"; layout = "master";
}; };
misc = { misc = {
disable_hyprland_logo = true; disable_hyprland_logo = true;
disable_splash_rendering = true; disable_splash_rendering = true;
}; };
decoration = { decoration = {
rounding = 5; rounding = 5;
}; };
input = { input = {
kb_layout = "us,de"; kb_layout = "us,de";
kb_variant = ",qwerty"; kb_variant = ",qwerty";
kb_options = "grp:alt_shift_toggle,caps:swapescape"; kb_options = "grp:alt_shift_toggle,caps:swapescape";
}; };
device = { device = {
name = "at-translated-set-2-keyboard"; name = "at-translated-set-2-keyboard";
repeat_rate = "50"; repeat_rate = "50";
bind = [ bind = [
# launch Apps # launch Apps
"$mod,TAB, exec, alacritty" "$mod,TAB, exec, alacritty"
@ -111,7 +94,6 @@
"$mod, Z, exec, sh $sciPath/screen.sh" "$mod, Z, exec, sh $sciPath/screen.sh"
"$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy" "$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
"$mod, O, exec, sh $sciPath/mpv.sh" "$mod, O, exec, sh $sciPath/mpv.sh"
# controles # controles
"$mod, Q, killactive" "$mod, Q, killactive"
"$mod, W, togglefloating" "$mod, W, togglefloating"
@ -123,7 +105,6 @@
"$mod, up, exec, sh $sciPath/volume.sh -i" "$mod, up, exec, sh $sciPath/volume.sh -i"
"$mod, down, exec, sh $sciPath/volume.sh -d" "$mod, down, exec, sh $sciPath/volume.sh -d"
"$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch pin" "$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch pin"
# cmus # cmus
"$mod, D, exec, sh $sciPath/cmus.sh" "$mod, D, exec, sh $sciPath/cmus.sh"
"$mod, space, exec, playerctl play-pause" "$mod, space, exec, playerctl play-pause"
@ -131,26 +112,22 @@
"$mod, period, exec, playerctl next" "$mod, period, exec, playerctl next"
"$mod, equal, exec, cmus-remote -v +10%" "$mod, equal, exec, cmus-remote -v +10%"
"$mod, minus, exec, cmus-remote -v -10%" "$mod, minus, exec, cmus-remote -v -10%"
# Move focus # Move focus
"$mod, Return, fullscreen" "$mod, Return, fullscreen"
"$mod, H, movefocus, l" "$mod, H, movefocus, l"
"$mod, L, movefocus, r" "$mod, L, movefocus, r"
"$mod, K, movefocus, u" "$mod, K, movefocus, u"
"$mod, J, movefocus, d" "$mod, J, movefocus, d"
# Window resizing X Y # Window resizing X Y
"CTRL+SHIFT, H, resizeactive, -60 0" "CTRL+SHIFT, H, resizeactive, -60 0"
"CTRL+SHIFT, L, resizeactive, 60 0" "CTRL+SHIFT, L, resizeactive, 60 0"
"CTRL+SHIFT, K, resizeactive, 0 -60" "CTRL+SHIFT, K, resizeactive, 0 -60"
"CTRL+SHIFT, J, resizeactive, 0 60" "CTRL+SHIFT, J, resizeactive, 0 60"
# Moving windows # Moving windows
"$mod SHIFT, H, swapwindow, l" "$mod SHIFT, H, swapwindow, l"
"$mod SHIFT, L, swapwindow, r" "$mod SHIFT, L, swapwindow, r"
"$mod SHIFT, K, swapwindow, u" "$mod SHIFT, K, swapwindow, u"
"$mod SHIFT, J, swapwindow, d" "$mod SHIFT, J, swapwindow, d"
# Switch workspaces # Switch workspaces
"$mod, 1, workspace, 1" "$mod, 1, workspace, 1"
"$mod, 2, workspace, 2" "$mod, 2, workspace, 2"
@ -162,7 +139,6 @@
"$mod, 8, workspace, 8" "$mod, 8, workspace, 8"
"$mod, 9, workspace, 9" "$mod, 9, workspace, 9"
"$mod, 0, workspace, 10" "$mod, 0, workspace, 10"
# Move active window to a workspace # Move active window to a workspace
"$mod+Shift, 1, movetoworkspace, 1" "$mod+Shift, 1, movetoworkspace, 1"
"$mod+Shift, 2, movetoworkspace, 2" "$mod+Shift, 2, movetoworkspace, 2"
@ -175,12 +151,10 @@
"$mod+Shift, 9, movetoworkspace, 9" "$mod+Shift, 9, movetoworkspace, 9"
"$mod+Shift, 0, movetoworkspace, 10" "$mod+Shift, 0, movetoworkspace, 10"
]; ];
bindm = [ bindm = [
"$mod, mouse:272, movewindow" "$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow" "$mod, mouse:273, resizewindow"
]; ];
bindl = [ bindl = [
", XF86MonBrightnessUp, exec, brightnessctl set +10%" ", XF86MonBrightnessUp, exec, brightnessctl set +10%"
", XF86MonBrightnessDown, exec, brightnessctl set 10%-" ", XF86MonBrightnessDown, exec, brightnessctl set 10%-"