Compare commits

..

4 Commits

Author SHA1 Message Date
Thomas Avé ce60bc3677
Add scrollwheel for niri 2026-07-20 16:03:33 +02:00
Thomas Avé 8c22880adc
Add explicit pointerCursor enable 2026-07-20 16:03:20 +02:00
Thomas Avé 7400213409
New ssh config style 2026-07-20 16:03:10 +02:00
Thomas Avé d58b3e331a
Update flake.lock 2026-07-20 16:02:49 +02:00
14 changed files with 33 additions and 20 deletions

View File

@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1783119102, "lastModified": 1784476090,
"narHash": "sha256-bXd034/ARs18ZQ7hWUAw9NwyfBmcKQws8DQHzwYp6jM=", "narHash": "sha256-flVUft590tsDX9z97O4DzVFg6zvOOmGeYhPeDdaP1DI=",
"owner": "aylur", "owner": "aylur",
"repo": "astal", "repo": "astal",
"rev": "04454c22094401cc8e682cfe1f8ecc3194cac5f9", "rev": "fd94e333c8bd45557291c805f1df79d5f787d590",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,11 +111,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1783963347, "lastModified": 1784546264,
"narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", "narHash": "sha256-jxVr5EHMYAOkFvS2k0abIvt6NqyshyWmiHHzV17sT2g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a45a7c451455a51ae740ec3bce4024b312809c29", "rev": "e3dea8e4792b09a6c0eb5836b0284ad05b1acba0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1783776592, "lastModified": 1784497964,
"narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -22,7 +22,7 @@ in {
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
home.packages = with pkgs; [ home.packages = with pkgs; [
jetbrains.pycharm jetbrains.pycharm

View File

@ -22,7 +22,7 @@ in {
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519";
home.packages = with pkgs; [ home.packages = with pkgs; [
rclone rclone

View File

@ -18,7 +18,7 @@ in {
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix {inherit inputs config pkgs;})
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519";
home.sessionVariables = { home.sessionVariables = {
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/"; NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";

View File

@ -8,7 +8,7 @@
(import ./utils/desktop.nix {inherit inputs config pkgs;}) (import ./utils/desktop.nix {inherit inputs config pkgs;})
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519";
home.packages = with pkgs; [ home.packages = with pkgs; [
distrobox distrobox

View File

@ -21,7 +21,7 @@ in {
(import ./utils/desktop.nix {inherit inputs config pkgs;}) (import ./utils/desktop.nix {inherit inputs config pkgs;})
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519";
dconf.settings = { dconf.settings = {
"org/virt-manager/virt-manager/connections" = { "org/virt-manager/virt-manager/connections" = {

View File

@ -91,7 +91,7 @@ in {
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519"; programs.ssh.settings."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519";
home.sessionVariables = { home.sessionVariables = {
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/"; NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";

View File

@ -18,7 +18,7 @@ in {
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix {inherit inputs config pkgs;})
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519";
home.sessionVariables = { home.sessionVariables = {
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/"; NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";

View File

@ -21,5 +21,5 @@ in {
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519";
} }

View File

@ -21,7 +21,7 @@
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Tolnedra/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Tolnedra/id_ed25519";
home.packages = with pkgs; [ home.packages = with pkgs; [
wl-clipboard wl-clipboard

View File

@ -69,7 +69,7 @@ in {
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Vault/id_ed25519"; programs.ssh.settings."*".identityFile = "/home/server/.secrets/SSH/Vault/id_ed25519";
home.sessionVariables = { home.sessionVariables = {
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/"; NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";

View File

@ -233,6 +233,18 @@ in {
XF86AudioMute { spawn "${wpctl}" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } XF86AudioMute { spawn "${wpctl}" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
XF86AudioMicMute { spawn "${wpctl}" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } XF86AudioMicMute { spawn "${wpctl}" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
// Horizontal mouse scroll controls volume
WheelScrollRight cooldown-ms=10 { spawn "${wpctl}" "set-volume" "@DEFAULT_AUDIO_SINK@" "1%+" "--limit" "1.0"; }
WheelScrollLeft cooldown-ms=10 { spawn "${wpctl}" "set-volume" "@DEFAULT_AUDIO_SINK@" "1%-"; }
// Mod + horizontal scroll moves between windows (columns) left/right
Mod+WheelScrollRight cooldown-ms=200 { focus-column-right; }
Mod+WheelScrollLeft cooldown-ms=200 { focus-column-left; }
// Mod + vertical scroll moves between workspaces up/down
Mod+WheelScrollDown cooldown-ms=100 { focus-workspace-down; }
Mod+WheelScrollUp cooldown-ms=100 { focus-workspace-up; }
// Media // Media
XF86AudioNext { spawn "${playerctl}" "next"; } XF86AudioNext { spawn "${playerctl}" "next"; }
XF86AudioPrev { spawn "${playerctl}" "previous"; } XF86AudioPrev { spawn "${playerctl}" "previous"; }

View File

@ -7,7 +7,7 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
matchBlocks = { settings = {
"*" = { "*" = {
host = "*"; host = "*";
}; };

View File

@ -87,6 +87,7 @@
}; };
home.pointerCursor = { home.pointerCursor = {
enable = true;
gtk.enable = true; gtk.enable = true;
name = "Adwaita"; name = "Adwaita";
size = 28; size = 28;