From 85b63fc1ce53d272f787143eb0cf6be9d2477d96 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Sep 2024 12:18:04 -0400 Subject: [PATCH 01/12] aly: add planify + kb shortcuts + wm rules --- homes/aly/gui.nix | 1 + homes/aly/windowManagers/default.nix | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/homes/aly/gui.nix b/homes/aly/gui.nix index 46138f44..5d501de1 100644 --- a/homes/aly/gui.nix +++ b/homes/aly/gui.nix @@ -19,6 +19,7 @@ self: {pkgs, ...}: { nicotine-plus obsidian picard + planify tauon transmission-remote-gtk tuba diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix index 9dff19a8..08f5320f 100644 --- a/homes/aly/windowManagers/default.nix +++ b/homes/aly/windowManagers/default.nix @@ -24,6 +24,7 @@ keybindings = { "${config.wayland.windowManager.sway.config.modifier}+N" = "exec ${lib.getExe' pkgs.obsidian "obsidian"}"; "${config.wayland.windowManager.sway.config.modifier}+P" = "exec ${lib.getExe pkgs.rofi-rbw-wayland}"; + "${config.wayland.windowManager.sway.config.modifier}+Space" = "exec ${lib.getExe' pkgs.planify "io.github.alainm23.planify.quick-add"}"; }; startup = [ @@ -55,6 +56,10 @@ command = "resize set 80ppt 80ppt; move position center; sticky toggle;"; criteria = {app_id = "org.keepassxc.KeePassXC";}; } + { + command = "move position center; sticky toggle; focus;"; + criteria = {app_id = "io.github.alainm23.planify.quick-add";}; + } { command = "move to scratchpad"; criteria = {app_id = "org.gnome.Fractal";}; @@ -70,6 +75,7 @@ bind = [ "SUPER,N,exec,${lib.getExe' pkgs.obsidian "obsidian"}" "SUPER,P,exec,${lib.getExe pkgs.rofi-rbw-wayland}" + "SUPER,SPACE,exec,${lib.getExe' pkgs.planify "io.github.alainm23.planify.quick-add"}" ]; dwindle.no_gaps_when_only = "1"; @@ -81,10 +87,12 @@ "center(1),class:(org.keepassxc.KeePassXC)" "float,class:(Bitwarden)" "float,class:(org.keepassxc.KeePassXC)" + "pin,class:(io.github.alainm23.planify.quick-add)" "size 80% 80%,class:(Bitwarden)" "size 80% 80%,class:(org.keepassxc.KeePassXC)" - "workspace special:magic,class:(vesktop)" + "stayfocused,class:(io.github.alainm23.planify.quick-add)" "workspace special:magic,class:(org.gnome.Fractal)" + "workspace special:magic,class:(vesktop)" ]; workspace = [ From b15353338b1bb5586ab5f44e3f118f16400cd189 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Sep 2024 12:31:55 -0400 Subject: [PATCH 02/12] alacritty: improve padding --- homeManagerModules/apps/alacritty/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homeManagerModules/apps/alacritty/default.nix b/homeManagerModules/apps/alacritty/default.nix index 41dddbf5..a92d9080 100644 --- a/homeManagerModules/apps/alacritty/default.nix +++ b/homeManagerModules/apps/alacritty/default.nix @@ -19,8 +19,10 @@ in { window = { blur = true; decorations = "Full"; - dynamic_padding = true; - opacity = 0.6; + padding = { + x = 10; + y = 10; + }; }; }; }; From 89cf76886e895ede920fee17d831129e038c38fa Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Sep 2024 13:26:31 -0400 Subject: [PATCH 03/12] waybar: default border-radius 0 --- homeManagerModules/services/waybar/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/homeManagerModules/services/waybar/default.nix b/homeManagerModules/services/waybar/default.nix index bffa94cd..f98062e6 100644 --- a/homeManagerModules/services/waybar/default.nix +++ b/homeManagerModules/services/waybar/default.nix @@ -332,6 +332,10 @@ in { color: ${config.lib.stylix.colors.withHashtag.base00}; font-weight: bold; } + + #waybar { + border-radius: 0; + } ''; systemd.enable = true; From 7e7efcf4ecd94e1e4a58a34c94495b43208cebc3 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Sep 2024 13:26:54 -0400 Subject: [PATCH 04/12] lavaridge: force border radius 10 --- hosts/lavaridge/home.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix index aef0c1fa..270e287b 100644 --- a/hosts/lavaridge/home.nix +++ b/hosts/lavaridge/home.nix @@ -19,6 +19,8 @@ gammastep.enable = lib.mkForce false; }; + + theme.borders.radius = lib.mkForce 10; }; } ]; From eb7640ee46702f8571795bb9176d64ee1996ce06 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Sep 2024 13:40:17 -0400 Subject: [PATCH 05/12] Revert "aly: add planify + kb shortcuts + wm rules" This reverts commit 85b63fc1ce53d272f787143eb0cf6be9d2477d96. --- homes/aly/gui.nix | 1 - homes/aly/windowManagers/default.nix | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/homes/aly/gui.nix b/homes/aly/gui.nix index 5d501de1..46138f44 100644 --- a/homes/aly/gui.nix +++ b/homes/aly/gui.nix @@ -19,7 +19,6 @@ self: {pkgs, ...}: { nicotine-plus obsidian picard - planify tauon transmission-remote-gtk tuba diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix index 08f5320f..9dff19a8 100644 --- a/homes/aly/windowManagers/default.nix +++ b/homes/aly/windowManagers/default.nix @@ -24,7 +24,6 @@ keybindings = { "${config.wayland.windowManager.sway.config.modifier}+N" = "exec ${lib.getExe' pkgs.obsidian "obsidian"}"; "${config.wayland.windowManager.sway.config.modifier}+P" = "exec ${lib.getExe pkgs.rofi-rbw-wayland}"; - "${config.wayland.windowManager.sway.config.modifier}+Space" = "exec ${lib.getExe' pkgs.planify "io.github.alainm23.planify.quick-add"}"; }; startup = [ @@ -56,10 +55,6 @@ command = "resize set 80ppt 80ppt; move position center; sticky toggle;"; criteria = {app_id = "org.keepassxc.KeePassXC";}; } - { - command = "move position center; sticky toggle; focus;"; - criteria = {app_id = "io.github.alainm23.planify.quick-add";}; - } { command = "move to scratchpad"; criteria = {app_id = "org.gnome.Fractal";}; @@ -75,7 +70,6 @@ bind = [ "SUPER,N,exec,${lib.getExe' pkgs.obsidian "obsidian"}" "SUPER,P,exec,${lib.getExe pkgs.rofi-rbw-wayland}" - "SUPER,SPACE,exec,${lib.getExe' pkgs.planify "io.github.alainm23.planify.quick-add"}" ]; dwindle.no_gaps_when_only = "1"; @@ -87,12 +81,10 @@ "center(1),class:(org.keepassxc.KeePassXC)" "float,class:(Bitwarden)" "float,class:(org.keepassxc.KeePassXC)" - "pin,class:(io.github.alainm23.planify.quick-add)" "size 80% 80%,class:(Bitwarden)" "size 80% 80%,class:(org.keepassxc.KeePassXC)" - "stayfocused,class:(io.github.alainm23.planify.quick-add)" - "workspace special:magic,class:(org.gnome.Fractal)" "workspace special:magic,class:(vesktop)" + "workspace special:magic,class:(org.gnome.Fractal)" ]; workspace = [ From d4a9417e3ba16b6647f05c758d6b3b5f64de06a7 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Sep 2024 22:35:42 -0400 Subject: [PATCH 06/12] easyeffects: add official framework preset --- .../services/easyeffects/default.nix | 8 +- .../easyeffects/fw13-easy-effects.json | 319 ++++++++++++++++++ 2 files changed, 322 insertions(+), 5 deletions(-) create mode 100644 homeManagerModules/services/easyeffects/fw13-easy-effects.json diff --git a/homeManagerModules/services/easyeffects/default.nix b/homeManagerModules/services/easyeffects/default.nix index 14ddaa7a..ec6702b9 100644 --- a/homeManagerModules/services/easyeffects/default.nix +++ b/homeManagerModules/services/easyeffects/default.nix @@ -5,11 +5,9 @@ }: { config = lib.mkIf config.ar.home.services.easyeffects.enable { xdg.configFile = { - "easyeffects/output/framework13.json".source = - ./framework13.json; - - "easyeffects/output/LoudnessEqualizer.json".source = - ./LoudnessEqualizer.json; + "easyeffects/output/framework13.json".source = ./framework13.json; + "easyeffects/output/fw13-easy-effects.json".source = ./framework13.json; + "easyeffects/output/LoudnessEqualizer.json".source = ./LoudnessEqualizer.json; }; services.easyeffects = { diff --git a/homeManagerModules/services/easyeffects/fw13-easy-effects.json b/homeManagerModules/services/easyeffects/fw13-easy-effects.json new file mode 100644 index 00000000..d229a0ee --- /dev/null +++ b/homeManagerModules/services/easyeffects/fw13-easy-effects.json @@ -0,0 +1,319 @@ +{ + "output": { + "bass_enhancer#0": { + "amount": 4.0, + "blend": 0.0, + "bypass": true, + "floor": 10.0, + "floor-active": true, + "harmonics": 10.0, + "input-gain": 0.0, + "output-gain": 0.0, + "scope": 200.0 + }, + "blocklist": [], + "convolver#0": { + "autogain": true, + "bypass": false, + "input-gain": 0.0, + "ir-width": 100, + "kernel-path": "%CFG%/irs/IR_22ms_27dB_5t_15s_0c.irs", + "output-gain": 6.0 + }, + "filter#0": { + "balance": 0.0, + "bypass": false, + "equal-mode": "IIR", + "frequency": 60.0, + "gain": 0.0, + "input-gain": 0.0, + "mode": "RLC (BT)", + "output-gain": 0.0, + "quality": 16.0, + "slope": "x16", + "type": "High-pass", + "width": 1.0 + }, + "limiter#0": { + "alr": false, + "alr-attack": 5.0, + "alr-knee": 0.0, + "alr-release": 50.0, + "attack": 2.0, + "bypass": false, + "dithering": "None", + "external-sidechain": false, + "gain-boost": true, + "input-gain": 0.0, + "lookahead": 4.0, + "mode": "Herm Thin", + "output-gain": 0.0, + "oversampling": "Half x4(2L)", + "release": 8.0, + "sidechain-preamp": 0.0, + "stereo-link": 100.0, + "threshold": 0.0 + }, + "multiband_compressor#0": { + "band0": { + "attack-threshold": -16.0, + "attack-time": 150.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "external-sidechain": false, + "knee": -12.0, + "makeup": 0.0, + "mute": false, + "ratio": 5.0, + "release-threshold": -100.0, + "release-time": 300.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 500.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 10.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "stereo-split-source": "Left/Right" + }, + "band1": { + "attack-threshold": -24.0, + "attack-time": 150.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "enable-band": true, + "external-sidechain": false, + "knee": -9.0, + "makeup": 5.0, + "mute": false, + "ratio": 3.0, + "release-threshold": -100.0, + "release-time": 200.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 1000.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 500.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "split-frequency": 250.0, + "stereo-split-source": "Left/Right" + }, + "band2": { + "attack-threshold": -24.0, + "attack-time": 100.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "enable-band": true, + "external-sidechain": false, + "knee": -9.0, + "makeup": 5.0, + "mute": false, + "ratio": 3.0, + "release-threshold": -100.0, + "release-time": 150.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 2000.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 1000.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "split-frequency": 1250.0, + "stereo-split-source": "Left/Right" + }, + "band3": { + "attack-threshold": -24.0, + "attack-time": 80.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "enable-band": true, + "external-sidechain": false, + "knee": -9.0, + "makeup": 5.0, + "mute": false, + "ratio": 4.0, + "release-threshold": -100.0, + "release-time": 120.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 4000.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 2000.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "split-frequency": 5000.0, + "stereo-split-source": "Left/Right" + }, + "band4": { + "attack-threshold": -12.0, + "attack-time": 20.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "enable-band": false, + "external-sidechain": false, + "knee": -6.0, + "makeup": 0.0, + "mute": false, + "ratio": 1.0, + "release-threshold": -100.0, + "release-time": 100.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 8000.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 4000.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "split-frequency": 4000.0, + "stereo-split-source": "Left/Right" + }, + "band5": { + "attack-threshold": -12.0, + "attack-time": 20.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "enable-band": false, + "external-sidechain": false, + "knee": -6.0, + "makeup": 0.0, + "mute": false, + "ratio": 1.0, + "release-threshold": -100.0, + "release-time": 100.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 12000.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 8000.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "split-frequency": 8000.0, + "stereo-split-source": "Left/Right" + }, + "band6": { + "attack-threshold": -12.0, + "attack-time": 20.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "enable-band": false, + "external-sidechain": false, + "knee": -6.0, + "makeup": 0.0, + "mute": false, + "ratio": 1.0, + "release-threshold": -100.0, + "release-time": 100.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 16000.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 12000.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "split-frequency": 12000.0, + "stereo-split-source": "Left/Right" + }, + "band7": { + "attack-threshold": -12.0, + "attack-time": 20.0, + "boost-amount": 6.0, + "boost-threshold": -72.0, + "compression-mode": "Downward", + "compressor-enable": true, + "enable-band": false, + "external-sidechain": false, + "knee": -6.0, + "makeup": 0.0, + "mute": false, + "ratio": 1.0, + "release-threshold": -100.0, + "release-time": 100.0, + "sidechain-custom-highcut-filter": false, + "sidechain-custom-lowcut-filter": false, + "sidechain-highcut-frequency": 20000.0, + "sidechain-lookahead": 0.0, + "sidechain-lowcut-frequency": 16000.0, + "sidechain-mode": "RMS", + "sidechain-preamp": 0.0, + "sidechain-reactivity": 10.0, + "sidechain-source": "Middle", + "solo": false, + "split-frequency": 16000.0, + "stereo-split-source": "Left/Right" + }, + "bypass": false, + "compressor-mode": "Modern", + "dry": -100.0, + "envelope-boost": "None", + "input-gain": 0.0, + "output-gain": 0.0, + "stereo-split": false, + "wet": 0.0 + }, + "plugins_order": [ + "filter#0", + "bass_enhancer#0", + "convolver#0", + "multiband_compressor#0", + "stereo_tools#0", + "limiter#0" + ], + "stereo_tools#0": { + "balance-in": 0.0, + "balance-out": 0.0, + "bypass": false, + "delay": 0.0, + "input-gain": 0.0, + "middle-level": 0.0, + "middle-panorama": 0.0, + "mode": "LR > LR (Stereo Default)", + "mutel": false, + "muter": false, + "output-gain": 0.0, + "phasel": false, + "phaser": false, + "sc-level": 1.0, + "side-balance": 0.0, + "side-level": 0.0, + "softclip": false, + "stereo-base": 0.30000000000000004, + "stereo-phase": 0.0 + } + } +} From df48b7176de31f6480a989e5aed555b916129851 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Sep 2024 22:47:27 -0400 Subject: [PATCH 07/12] fallarbor,lavaridge: swap easyeffects preset for official framework preset --- hosts/fallarbor/home.nix | 5 +++++ hosts/lavaridge/home.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts/fallarbor/home.nix b/hosts/fallarbor/home.nix index fec165fc..826427be 100644 --- a/hosts/fallarbor/home.nix +++ b/hosts/fallarbor/home.nix @@ -1,6 +1,11 @@ { home-manager.sharedModules = [ { + services.easyeffects = { + enable = true; + preset = "fw13-easy-effects"; + }; + wayland.windowManager.sway.config.output = {"BOE 0x095F Unknown".scale = "1.5";}; ar.home.desktop.hyprland.laptopMonitors = ["desc:BOE 0x095F,preferred,auto,1.566667"]; } diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix index 270e287b..2ed658eb 100644 --- a/hosts/lavaridge/home.nix +++ b/hosts/lavaridge/home.nix @@ -14,7 +14,7 @@ services = { easyeffects = { enable = true; - preset = "LoudnessEqualizer"; + preset = "fw13-easy-effects"; }; gammastep.enable = lib.mkForce false; From 5e659a29dc23dbeea7c9ac5e6a5e37addb6df469 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 20 Sep 2024 07:27:24 -0400 Subject: [PATCH 08/12] flake.lock: Update (#109) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c57cd188..09a4c720 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1720809814, - "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "type": "github" }, "original": { @@ -187,11 +187,11 @@ ] }, "locked": { - "lastModified": 1726153585, - "narHash": "sha256-ShZ3YeEutJk+QoY/VrpujzZgocmyXYqhOC8I8pudO9U=", + "lastModified": 1726775926, + "narHash": "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho=", "owner": "nix-community", "repo": "disko", - "rev": "59fb64b36b0a1961f6d4c6d5b8db45cc35d040f2", + "rev": "624fd86460e482017ed9c3c3c55a3758c06a4e7f", "type": "github" }, "original": { @@ -354,11 +354,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726592409, + "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -491,11 +491,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nur": { "locked": { - "lastModified": 1726206275, - "narHash": "sha256-Kv31qBNBXR8rMGSJR6qWQO5V8jZsc5/Clqplz55bu3I=", + "lastModified": 1726811691, + "narHash": "sha256-QjeSsVQo6q7gmWpAreIebQC4fLv4cIgQiPsJjgHmb6E=", "owner": "nix-community", "repo": "NUR", - "rev": "bf3814db0d52cd993cbbf5e4832c84f89caaf6c3", + "rev": "cf02274315ba8e91aa8c4bc5e336760af35f42e5", "type": "github" }, "original": { @@ -666,11 +666,11 @@ "wallpapers": { "flake": false, "locked": { - "lastModified": 1725863505, - "narHash": "sha256-T7FQ4RL62PVb7pN8nBh7+y+0Cimsr2DfbOFEPrCDDLc=", + "lastModified": 1726468197, + "narHash": "sha256-rag8Dk2qYswdE1GH5ocEF6PhFmnd6amzreZ3ZjLk2iI=", "owner": "alyraffauf", "repo": "wallpapers", - "rev": "f5f6b15b219c573fecf7b59749f6db8cafef1fe8", + "rev": "fc6bd53fdb9f2c1287e6ce36145a14773bae4dce", "type": "github" }, "original": { From d489a24dbc3fb5a4cdfa79997d077eb4faba29a5 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 20 Sep 2024 13:02:20 -0400 Subject: [PATCH 09/12] flake: bump nixhw --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 09a4c720..d2c62dcf 100644 --- a/flake.lock +++ b/flake.lock @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1726660103, - "narHash": "sha256-6dTw76l3zyBxW2a5Xn6UfY+uFzcJgyN4IiM8tI9Vu5I=", + "lastModified": 1726836401, + "narHash": "sha256-MO/h4RV4Ho4g3W7h6xQkCu5X3wBD1YnziP1Sg/PCCyA=", "owner": "alyraffauf", "repo": "nixhw", - "rev": "19c6cdbfe1b757aa71b9ef9e9285fb1581704be9", + "rev": "bd0c54e428c18213321a16f71ce0782d48c27350", "type": "github" }, "original": { From f71c3d1a4ee0cf72b52d84a503ee703427df8524 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 13 Sep 2024 17:06:08 -0400 Subject: [PATCH 10/12] secrets/tailscale: swap authkey --- secrets/tailscale/authKeyFile.age | 53 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/secrets/tailscale/authKeyFile.age b/secrets/tailscale/authKeyFile.age index ee1d96f3..e14674aa 100644 --- a/secrets/tailscale/authKeyFile.age +++ b/secrets/tailscale/authKeyFile.age @@ -1,27 +1,28 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ VvGVZPvb3Tf4gONvi6G53hV1vOzoAZYlOy6Zclgu6XM -e2pYgw0Ls8a5peGgpJ/N7xEPH/Wg9iERry8jcRN7qCA --> ssh-ed25519 g+apXg A7YdPw6q4vKNCYd7NBu6ztlnSf71yHkOg/dx+qQIXnk -kfszANrVL/nK0drABvVRLB8+PVo9pcH5YCUi+oDmMJY --> ssh-ed25519 xZaw4A m+wF6orByKCDKkjd0ThZsU7Z2Qw0emXnSsO6Aal4/WA -7461LuM6VqJe3aeltZDkQTPgVRgaHQxpIzsweLv1O/A --> ssh-ed25519 GrlIbA pma0CHxGf73YpS5dpBxujZwfbjlSecVh4v2XAdIpXic -m0kuH2IFU1/haykVuaGWPOWu2Kd52YoRtwE9yREE0Ic --> ssh-ed25519 1GkM5g LA00XqVcwhM+BV3kmjTmwI6+eEBcr4nnWS80ckL8AFA -jOJyCej7LPAGXhkfWek5tR5ixuxrgXSuVWJx2YT1j8Y --> ssh-ed25519 d5QLRA h7/0GZTu3lNfCelfOB63DH3hwtIYZAX+C9tAHekg4mA -8qBKUluHG73MtBAHiN4phbM6o/DoNBmDXPUG0BHCzJM --> ssh-ed25519 nrny8w 9Y+zQCpEk8DJqYB+16rMFYzz//w7pdPxZkmf6M7ad0c -PBEqi+tqWg7sLPIwBwibekbSPiqxOv6sgpFuveL3aZk --> ssh-ed25519 c7E/gQ nkv0xKXzCgwHA6kpajciuYSyCVtLJgekT2eEBoLLDGc -h4eDuUA6x979ZMTLxam3wZ/4vj1cgNsLesE806vay2w --> ssh-ed25519 IghKlQ ku7oPkgqdyNZFUDjMk1CPV9M9dnl60HcfMKOE/hfHi0 -XIT0OkA6jHWOkHaD4n1xIKSqZghYulmuL4vOuFIGajE --> ssh-ed25519 1mX44w 0BU00d9x+YSrXP6UwIFWfAta8ie8uDxFnxkH009ngB8 -VceUd5tZdYobirANTB59wn9dRdeJYPiSPx8aEtWaUWI --> ssh-ed25519 t3ooSw 405zXjue6n9FrxTxHkcFB0UibHdS7/Qhjz7g1WBQmiw -XtQ4T9IMrSY/3FOQxNOx5sNrB1qK9H6wnWPuDh2bsDY --> ssh-ed25519 aWdXQA PfFKw90tMXZ7ilRGfKXbMnuK8jOjSt0ho+GQQXfBcjs -S72pBxg1kgP/5WyU+HU60k2rS4fd0RruUMK8wDsfJE4 ---- T7Tz7O7lrDBq1w8W6skBBLkfz7T0kUSOvnPb5MlQ7/A -20f9X\t%ބ{*yF46:XRPP꒵xP8U|2˰|ލy,@4@ \ No newline at end of file +-> ssh-ed25519 xIeYNQ BlkZ04hv8a2mcG3K5rfDdeOisAUTvWkGjwuZ8DFEBQU +5inc9zhip+QEPCJeSs9hbIxh8JkB3YMXhaWBPZnqJQ0 +-> ssh-ed25519 g+apXg yfOoKmYVVhy9ldQTAuySpLgPP2SxeS/WoNh6z5SkqCI +spfN7zfKTPWCyOJP4SkLTS9wLvx8PUzGXdjQlpspHvI +-> ssh-ed25519 xZaw4A ocwKguQJ/LPWBgrbBNE8IqLwxAMTbscZlkTPiRDl0SU +s7oTyv2VzGSIuJaPOF4Cbjxs9keQjypLx65B0VksZr0 +-> ssh-ed25519 GrlIbA HBcGtVFOyAPtmA9HxQwiJKZzAXlvtgS/MBdlBd12zgU +kUkoaJp/070tiPWnCT4Dx9ZxmFC7m9FMc810u7GG/DI +-> ssh-ed25519 1GkM5g qe9i+s9u7qNSbhm/inX3p5Es1TbVShVjBK01LovpIQs +S/yFdGMArpPWxZTGAeDoYOOY/9BCZjiZyrxHbgZyo7w +-> ssh-ed25519 d5QLRA TSzFP7qN0xpKn18eYBx9RmKXgfp/JyyOPyL4pJpnyAE +RvdfFW9cIOntPyiliGpZURTHMDWa4F3fhTHZE5EJogM +-> ssh-ed25519 nrny8w IuqWWB2FF2PS8auCpDzbR5sQGAmO9iAELYytc5y1Pzc +uGKqqbaRKY9bgyl4KrL3Cw1jGyojkEJGIf+X2jZloow +-> ssh-ed25519 c7E/gQ 5E1vLioo1oN41w7uK2f2tKvlrhX0n8WxIfFafD1jUkA +OfyU3m/NbDGEm5Qc3UIS0d8O/IOIysHq1KBFlKp650c +-> ssh-ed25519 IghKlQ z98a0JBWTn9H4fLUj+rKygt3diXY9S5kjmwJeTsaMFc +KV+re+o6j/8zzUN8a3WbrLgA+dDCw+TGsIZopP42JG0 +-> ssh-ed25519 1mX44w iiV4Q9GNCohV1TrFINXqX0geIy/M86iJfz56tU4prDY +qgeamCWz8r7P2ksDxvDt93tv28ZH9nYDvct0POpOlzk +-> ssh-ed25519 t3ooSw INW0CG1NigjlGvAlSLttQcRosyY5Y3wMnrwNgs4GFRI +xxjVoMg7hrVWVVpAMGg616o7JzuoQVGsrkTJSknVxLo +-> ssh-ed25519 aWdXQA 7Hkg1Moowdtdz3Sk+Rp27kcj3j54FMmeJncpXYkCxjk +jZWbS6rbzsjd05tAkfjw8eY6NW0wCTtT2o4TWkcZ888 +--- UL0Qq4bSeQVBpGVn144zOfqIhmsZLTJRATb3ye14pZA +g}ѣ8+T?a;2'xBXyuѳAW>xU)}Ipd5 +oT}Zg2Q `XsrM Date: Sat, 21 Sep 2024 12:06:01 -0400 Subject: [PATCH 11/12] common/wifi: use iwd as wifi backend --- common/wifi.nix | 71 ++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/common/wifi.nix b/common/wifi.nix index 04e09c7a..373afc15 100644 --- a/common/wifi.nix +++ b/common/wifi.nix @@ -1,35 +1,4 @@ -{config, ...}: let - mkOpenWiFi = ssid: { - connection.id = "${ssid}"; - connection.type = "wifi"; - ipv4.method = "auto"; - ipv6.addr-gen-mode = "default"; - ipv6.method = "auto"; - wifi.mode = "infrastructure"; - wifi.ssid = "${ssid}"; - }; - - mkWPA2WiFi = ssid: psk: ( - (mkOpenWiFi ssid) - // { - wifi-security.auth-alg = "open"; - wifi-security.key-mgmt = "wpa-psk"; - wifi-security.psk = "${psk}"; - } - ); - - mkEAPWiFi = ssid: identity: pass: auth: ( - (mkOpenWiFi ssid) - // { - "802-1x".eap = "peap;"; - "802-1x".identity = "${identity}"; - "802-1x".password = "${pass}"; - "802-1x".phase2-auth = "${auth}"; - wifi-security.auth-alg = "open"; - wifi-security.key-mgmt = "wpa-eap"; - } - ); -in { +{config, ...}: { age.secrets.wifi.file = ../secrets/wifi.age; networking.networkmanager = { @@ -37,7 +6,38 @@ in { ensureProfiles = { environmentFiles = [config.age.secrets.wifi.path]; - profiles = { + profiles = let + mkOpenWiFi = ssid: { + connection.id = "${ssid}"; + connection.type = "wifi"; + ipv4.method = "auto"; + ipv6.addr-gen-mode = "default"; + ipv6.method = "auto"; + wifi.mode = "infrastructure"; + wifi.ssid = "${ssid}"; + }; + + mkWPA2WiFi = ssid: psk: ( + (mkOpenWiFi ssid) + // { + wifi-security.auth-alg = "open"; + wifi-security.key-mgmt = "wpa-psk"; + wifi-security.psk = "${psk}"; + } + ); + + mkEAPWiFi = ssid: identity: pass: auth: ( + (mkOpenWiFi ssid) + // { + "802-1x".eap = "peap;"; + "802-1x".identity = "${identity}"; + "802-1x".password = "${pass}"; + "802-1x".phase2-auth = "${auth}"; + wifi-security.auth-alg = "open"; + wifi-security.key-mgmt = "wpa-eap"; + } + ); + in { "Dustin's A54" = mkWPA2WiFi "Dustin's A54" "$DustinsA54PSK"; "InmanPerkCustomer" = mkWPA2WiFi "InmanPerkCustomer" "$InmanPerkCustomerPSK"; "Muchacho Guest" = mkOpenWiFi "Muchacho Guest"; @@ -51,5 +51,10 @@ in { "wallace" = mkWPA2WiFi "wallace" "$wallacePSK"; }; }; + + wifi = { + backend = "iwd"; + powersave = true; + }; }; } From a76633d15170e1452d1a58861b3c13425b5d799f Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sat, 21 Sep 2024 22:06:59 -0400 Subject: [PATCH 12/12] mauville/hyprland: use master layout --- hosts/mauville/home.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix index 05dda53f..f5f521f4 100644 --- a/hosts/mauville/home.nix +++ b/hosts/mauville/home.nix @@ -87,6 +87,16 @@ Unit.Description = "Daily backups to Backblaze."; }; }; + + wayland.windowManager.hyprland.settings = { + bind = ["$mod SHIFT,M,layoutmsg,swapwithmaster master"]; + general.layout = lib.mkForce "master"; + + master = { + mfact = 0.50; + orientation = "center"; + }; + }; }); }; }