From fdb33fc92b1b9665d9cdae5d8038b3eb8b2c7e31 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 22 Sep 2024 13:26:43 -0400 Subject: [PATCH 01/14] mauville: switch to hyprland --- hosts/mauville/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix index 15dadc78..cf18d487 100644 --- a/hosts/mauville/default.nix +++ b/hosts/mauville/default.nix @@ -114,10 +114,11 @@ in { greetd = { enable = true; autologin = "aly"; - session = lib.getExe config.programs.sway.package; + session = lib.getExe config.programs.hyprland.package; }; steam.enable = true; + hyprland.enable = true; sway.enable = true; }; From ec1814f76a243b19cd0da4baec1701276a0552d4 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 22 Sep 2024 13:26:57 -0400 Subject: [PATCH 02/14] mauville/hyprland: adjust mfact --- hosts/mauville/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix index f5f521f4..24f6970a 100644 --- a/hosts/mauville/home.nix +++ b/hosts/mauville/home.nix @@ -93,7 +93,7 @@ general.layout = lib.mkForce "master"; master = { - mfact = 0.50; + mfact = 0.40; orientation = "center"; }; }; From fb1083dc46509d8d6f64a8ff5bd374ab6487ded3 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 22 Sep 2024 15:52:29 -0400 Subject: [PATCH 03/14] hpyrland: improve master layout settings and binds --- homeManagerModules/desktop/hyprland/README.md | 3 ++- .../desktop/hyprland/settings.nix | 24 ++++++++----------- hosts/mauville/home.nix | 1 - 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/homeManagerModules/desktop/hyprland/README.md b/homeManagerModules/desktop/hyprland/README.md index 81c5e71d..923c03f1 100644 --- a/homeManagerModules/desktop/hyprland/README.md +++ b/homeManagerModules/desktop/hyprland/README.md @@ -73,8 +73,9 @@ ______________________________________________________________________ - SUPER + F11: Show/hide top panel. - SUPER + TAB: Open Window list. - SUPER + V: Toggle floating window. -- SUPER SHIFT + Backslash: Toggle vertical/horizontal splits. +- SUPER SHIFT + Backslash: Toggle vertical/horizontal splits (dwindle layout only). - SUPER SHIFT + G: Toggle groupbar. +- SUPER SHIFT + M: Swap window for master (master layout only). - SUPER SHIFT + W: Toggle fullscreen. #### Focus diff --git a/homeManagerModules/desktop/hyprland/settings.nix b/homeManagerModules/desktop/hyprland/settings.nix index 0cdd7174..32d0f020 100644 --- a/homeManagerModules/desktop/hyprland/settings.nix +++ b/homeManagerModules/desktop/hyprland/settings.nix @@ -27,37 +27,38 @@ in { bind = [ + ''$mod,M,exec,${lib.getExe config.programs.rofi.package} -show power-menu -modi "power-menu:${lib.getExe pkgs.rofi-power-menu} --choices=logout/lockscreen/suspend/shutdown/reboot"'' + ",PRINT,exec,${helpers.screenshot}" "$mod CTRL,L,exec,${lib.getExe pkgs.swaylock}" + "$mod SHIFT,backslash,togglesplit" + "$mod SHIFT,comma,exec,${lib.getExe pkgs.hyprnome} --previous --move" "$mod SHIFT,G,togglegroup" + "$mod SHIFT,M,layoutmsg,swapwithmaster master" + "$mod SHIFT,period,exec,${lib.getExe pkgs.hyprnome} --move" "$mod SHIFT,R,exec,${lib.getExe config.programs.rofi.package} -show run" "$mod SHIFT,S,movetoworkspace,special:magic" "$mod SHIFT,V,togglefloating" "$mod SHIFT,W,fullscreen" - "$mod SHIFT,backslash,togglesplit" - "$mod SHIFT,comma,exec,${lib.getExe pkgs.hyprnome} --previous --move" - "$mod SHIFT,period,exec,${lib.getExe pkgs.hyprnome} --move" "$mod,B,exec,${lib.getExe cfg.defaultApps.webBrowser}" "$mod,C,killactive" + "$mod,comma,exec,${lib.getExe pkgs.hyprnome} --previous" "$mod,E,exec,${lib.getExe cfg.defaultApps.editor}" "$mod,F,exec,${lib.getExe cfg.defaultApps.fileManager}" "$mod,F11,exec,pkill -SIGUSR1 waybar" "$mod,H,changegroupactive,b" "$mod,L,changegroupactive,f" "$mod,Left,changegroupactive,b" + "$mod,mouse_down,workspace,+1" + "$mod,mouse_up,workspace,-1" + "$mod,period,exec,${lib.getExe pkgs.hyprnome}" "$mod,R,exec,${lib.getExe config.programs.rofi.package} -show combi" "$mod,Right,changegroupactive,f" "$mod,S,togglespecialworkspace,magic" "$mod,T,exec,${lib.getExe cfg.defaultApps.terminal}" "$mod,Tab,exec,${lib.getExe config.programs.rofi.package} -show window" - "$mod,comma,exec,${lib.getExe pkgs.hyprnome} --previous" - "$mod,mouse_down,workspace,+1" - "$mod,mouse_up,workspace,-1" - "$mod,period,exec,${lib.getExe pkgs.hyprnome}" - ",PRINT,exec,${helpers.screenshot}" "CTRL ALT,M,submap,move" "CTRL ALT,R,submap,resize" "CTRL,F12,exec,${helpers.screenshot}" - ''$mod,M,exec,${lib.getExe config.programs.rofi.package} -show power-menu -modi "power-menu:${lib.getExe pkgs.rofi-power-menu} --choices=logout/lockscreen/suspend/shutdown/reboot"'' ] ++ builtins.map (x: "$mod SHIFT,${toString x},movetoworkspace,${toString x}") [1 2 3 4 5 6 7 8 9] ++ builtins.map (x: "$mod,${toString x},workspace,${toString x}") [1 2 3 4 5 6 7 8 9] @@ -168,11 +169,6 @@ in { }; }; - master = { - always_center_master = true; - new_status = false; - }; - misc = { disable_hyprland_logo = true; disable_splash_rendering = true; diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix index 24f6970a..d022fd91 100644 --- a/hosts/mauville/home.nix +++ b/hosts/mauville/home.nix @@ -89,7 +89,6 @@ }; wayland.windowManager.hyprland.settings = { - bind = ["$mod SHIFT,M,layoutmsg,swapwithmaster master"]; general.layout = lib.mkForce "master"; master = { From bbb0fc48c52db05ccae38b9baeff1d9593119b08 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 23 Sep 2024 19:05:55 -0400 Subject: [PATCH 04/14] mauville: change wallpaper --- hosts/mauville/stylix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/mauville/stylix.nix b/hosts/mauville/stylix.nix index fd317ea4..194f2331 100644 --- a/hosts/mauville/stylix.nix +++ b/hosts/mauville/stylix.nix @@ -6,7 +6,7 @@ stylix = { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; - image = "${self.inputs.wallpapers}/wallhaven-mp886k.jpg"; + image = "${self.inputs.wallpapers}/wallhaven-3lyrvy.png"; imageScalingMode = "fill"; polarity = "dark"; From d3b9eceea5616bfdc3f23a56b9eeb0e2a31dd872 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 23 Sep 2024 19:07:08 -0400 Subject: [PATCH 05/14] aly: diable randomWallpaper --- homes/aly/gui.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/homes/aly/gui.nix b/homes/aly/gui.nix index 46138f44..a822f57b 100644 --- a/homes/aly/gui.nix +++ b/homes/aly/gui.nix @@ -45,10 +45,7 @@ self: {pkgs, ...}: { fileManager = pkgs.xfce.thunar; }; - services = { - gammastep.enable = true; - randomWallpaper.enable = true; - }; + services.gammastep.enable = true; theme = { enable = true; From 76d87477c88563f3ef2954246b238c56671cfc89 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 23 Sep 2024 19:48:14 -0400 Subject: [PATCH 06/14] flake: bump wallpapers --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d2c62dcf..fa77133d 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ "wallpapers": { "flake": false, "locked": { - "lastModified": 1726468197, - "narHash": "sha256-rag8Dk2qYswdE1GH5ocEF6PhFmnd6amzreZ3ZjLk2iI=", + "lastModified": 1727132619, + "narHash": "sha256-1V9LK/0GwsLjAwedYcW5uXq1y8l4W86Ce2DvrlseLcA=", "owner": "alyraffauf", "repo": "wallpapers", - "rev": "fc6bd53fdb9f2c1287e6ce36145a14773bae4dce", + "rev": "b86110d079361e785014fdc22eb3684bccf891c9", "type": "github" }, "original": { From 93c29eb35d5c0f3364dae140ee24adb7d6a53ea1 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 23 Sep 2024 20:17:38 -0400 Subject: [PATCH 07/14] wifi: don't use iwd by default --- common/wifi.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/common/wifi.nix b/common/wifi.nix index 373afc15..7d531710 100644 --- a/common/wifi.nix +++ b/common/wifi.nix @@ -52,9 +52,6 @@ }; }; - wifi = { - backend = "iwd"; - powersave = true; - }; + wifi.powersave = true; }; } From 06793563a6b5796addd23b104aedca633e0d2aa5 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 23 Sep 2024 20:18:49 -0400 Subject: [PATCH 08/14] fallarbor: don't autoupgrade --- hosts/fallarbor/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hosts/fallarbor/default.nix b/hosts/fallarbor/default.nix index 929daf58..b7e3c2db 100644 --- a/hosts/fallarbor/default.nix +++ b/hosts/fallarbor/default.nix @@ -11,7 +11,6 @@ ./secrets.nix ./stylix.nix self.inputs.nixhw.nixosModules.framework-13-intel-11th - self.nixosModules.common-auto-upgrade self.nixosModules.common-base self.nixosModules.common-locale self.nixosModules.common-mauville-share @@ -26,11 +25,7 @@ systemd-boot.enable = true; }; - environment.variables = { - FLAKE = "https://flakehub.com/f/alyraffauf/nixcfg/*.tar.gz"; - GDK_SCALE = "1.5"; - }; - + environment.variables.GDK_SCALE = "1.5"; networking.hostName = "fallarbor"; system.stateVersion = "24.05"; From 75f53fafee195003fcc4a8aef885dfc378ebdc66 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 23 Sep 2024 23:59:07 -0400 Subject: [PATCH 09/14] reuse disko configs where possible --- .../disko.nix => disko/btrfs-subvolumes.nix | 4 +- .../luks-btrfs-subvolumes.nix | 4 +- hosts/lavaridge/default.nix | 2 +- hosts/petalburg/default.nix | 2 +- hosts/petalburg/disko.nix | 56 ------------------- hosts/rustboro/default.nix | 2 +- hosts/rustboro/disko.nix | 56 ------------------- hosts/slateport/default.nix | 4 +- 8 files changed, 9 insertions(+), 121 deletions(-) rename hosts/slateport/disko.nix => disko/btrfs-subvolumes.nix (95%) rename hosts/lavaridge/disko.nix => disko/luks-btrfs-subvolumes.nix (95%) delete mode 100644 hosts/petalburg/disko.nix delete mode 100644 hosts/rustboro/disko.nix diff --git a/hosts/slateport/disko.nix b/disko/btrfs-subvolumes.nix similarity index 95% rename from hosts/slateport/disko.nix rename to disko/btrfs-subvolumes.nix index 49a32b36..9d2c4ec4 100644 --- a/hosts/slateport/disko.nix +++ b/disko/btrfs-subvolumes.nix @@ -1,9 +1,9 @@ -{ +{disks ? ["/dev/nvme0n1"], ...}: { disko.devices = { disk = { main = { type = "disk"; - device = "/dev/sda"; + device = builtins.elemAt disks 0; content = { type = "gpt"; diff --git a/hosts/lavaridge/disko.nix b/disko/luks-btrfs-subvolumes.nix similarity index 95% rename from hosts/lavaridge/disko.nix rename to disko/luks-btrfs-subvolumes.nix index a6a16273..98f83558 100644 --- a/hosts/lavaridge/disko.nix +++ b/disko/luks-btrfs-subvolumes.nix @@ -1,9 +1,9 @@ -{ +{disks ? ["/dev/nvme0n1"], ...}: { disko.devices = { disk = { vdb = { type = "disk"; - device = "/dev/nvme0n1"; + device = builtins.elemAt disks 0; content = { type = "gpt"; partitions = { diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index a5d644a4..78349f6e 100644 --- a/hosts/lavaridge/default.nix +++ b/hosts/lavaridge/default.nix @@ -6,10 +6,10 @@ ... }: { imports = [ - ./disko.nix ./home.nix ./secrets.nix ./stylix.nix + (import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];}) self.inputs.nixhw.nixosModules.framework-13-amd-7000 self.nixosModules.common-auto-upgrade self.nixosModules.common-base diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix index f18742aa..2f7c38b9 100644 --- a/hosts/petalburg/default.nix +++ b/hosts/petalburg/default.nix @@ -6,10 +6,10 @@ ... }: { imports = [ - ./disko.nix ./home.nix ./secrets.nix ./stylix.nix + (import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];}) self.inputs.nixhw.nixosModules.lenovo-yoga-9i-intel-13th self.nixosModules.common-auto-upgrade self.nixosModules.common-base diff --git a/hosts/petalburg/disko.nix b/hosts/petalburg/disko.nix deleted file mode 100644 index a6a16273..00000000 --- a/hosts/petalburg/disko.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - disko.devices = { - disk = { - vdb = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "1024M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - content = { - type = "btrfs"; - extraArgs = ["-f"]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "persist" = { - mountpoint = "/persist"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = ["compress=zstd" "noatime"]; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix index 5f2268ea..01f9ff26 100644 --- a/hosts/rustboro/default.nix +++ b/hosts/rustboro/default.nix @@ -6,10 +6,10 @@ ... }: { imports = [ - ./disko.nix ./home.nix ./secrets.nix ./stylix.nix + (import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/sda"];}) self.inputs.nixhw.nixosModules.thinkpad-t440p self.nixosModules.common-auto-upgrade self.nixosModules.common-base diff --git a/hosts/rustboro/disko.nix b/hosts/rustboro/disko.nix deleted file mode 100644 index 66b9e72f..00000000 --- a/hosts/rustboro/disko.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - disko.devices = { - disk = { - vdb = { - type = "disk"; - device = "/dev/sda"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "1024M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - content = { - type = "btrfs"; - extraArgs = ["-f"]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "persist" = { - mountpoint = "/persist"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = ["compress=zstd" "noatime"]; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/slateport/default.nix b/hosts/slateport/default.nix index a8b4d041..403be865 100644 --- a/hosts/slateport/default.nix +++ b/hosts/slateport/default.nix @@ -4,13 +4,13 @@ ... }: { imports = [ - ./disko.nix ./home.nix ./raffauflabs.nix ./secrets.nix + (import ./../../disko/btrfs-subvolumes.nix {disks = ["/dev/sda"];}) + self.inputs.nixhw.nixosModules.common-bluetooth self.inputs.nixhw.nixosModules.common-intel-cpu self.inputs.nixhw.nixosModules.common-intel-gpu - self.inputs.nixhw.nixosModules.common-bluetooth self.inputs.nixhw.nixosModules.common-ssd self.nixosModules.common-auto-upgrade self.nixosModules.common-base From c87e1ba183fa394a3f8f1df6278ebf7f002c9600 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Tue, 24 Sep 2024 13:30:55 -0400 Subject: [PATCH 10/14] hyprland: use hyprpaper if randomWallpaper not enabled --- homeManagerModules/desktop/hyprland/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix index dee99b44..6298956e 100644 --- a/homeManagerModules/desktop/hyprland/default.nix +++ b/homeManagerModules/desktop/hyprland/default.nix @@ -7,6 +7,18 @@ cfg = config.ar.home; in { config = lib.mkIf cfg.desktop.hyprland.enable { + services.hyprpaper = + lib.mkIf + (config.stylix.enable && !cfg.services.randomWallpaper.enable) + { + enable = true; + + settings = { + preload = ["${config.stylix.image}"]; + wallpaper = [",${config.stylix.image}"]; + }; + }; + wayland.windowManager.hyprland = { enable = true; settings = import ./settings.nix {inherit config lib pkgs;}; From 2c34bacd8fc319655184401af4c3bcf397ec900d Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Tue, 24 Sep 2024 13:31:03 -0400 Subject: [PATCH 11/14] wifi: add east pole wifi --- common/wifi.nix | 9 +++++---- secrets/wifi.age | Bin 1746 -> 1771 bytes 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/wifi.nix b/common/wifi.nix index 7d531710..e327a00b 100644 --- a/common/wifi.nix +++ b/common/wifi.nix @@ -39,16 +39,17 @@ ); in { "Dustin's A54" = mkWPA2WiFi "Dustin's A54" "$DustinsA54PSK"; + "East Pole Coffee Co." = mkWPA2WiFi "East Pole Coffee Co." "$EastPolePSK"; "InmanPerkCustomer" = mkWPA2WiFi "InmanPerkCustomer" "$InmanPerkCustomerPSK"; + "javapatron" = mkOpenWiFi "javapatron"; "Muchacho Guest" = mkOpenWiFi "Muchacho Guest"; - "PERCguest" = mkWPA2WiFi "PERCguest" "$PERCguestPSK"; - "PERC COFFEE 5 Guest" = mkWPA2WiFi "PERC COFFEE 5 Guest" "$PERCguestPSK"; "Parkgrounds1" = mkWPA2WiFi "Parkgrounds1" "$Parkgrounds1PSK"; + "PERC COFFEE 5 Guest" = mkWPA2WiFi "PERC COFFEE 5 Guest" "$PERCguestPSK"; + "PERCguest" = mkWPA2WiFi "PERCguest" "$PERCguestPSK"; "Stargate-Discovery" = mkWPA2WiFi "Stargate-Discovery" "$StargateDiscoveryPSK"; "Taproom Public WiFi" = mkOpenWiFi "Taproom Public WiFi"; - "WeWorkWiFi" = mkEAPWiFi "WeWorkWiFi" "$WeWorkWiFiIdentity" "$WeWorkWiFiPassword" "mschapv2"; - "javapatron" = mkOpenWiFi "javapatron"; "wallace" = mkWPA2WiFi "wallace" "$wallacePSK"; + "WeWorkWiFi" = mkEAPWiFi "WeWorkWiFi" "$WeWorkWiFiIdentity" "$WeWorkWiFiPassword" "mschapv2"; }; }; diff --git a/secrets/wifi.age b/secrets/wifi.age index b2efadb1d1930c0d928f0ea632735a474bcddaa0..6ba49fb721a5ff25ab946b3aecfdebbe1a90dbb0 100644 GIT binary patch literal 1771 zcmZY8|Ige60mtzz7(>n>>Xv|$gwrA0a(UMFu3v-7)86%Z{d(j(l7)smf!u3(fu0?b91z)_A5M~gZQV1XVwLT2{UHKXB0BrHeE zY#@_6HMeFh47Zxi8g>^7EP2eW6l`eNmNfR)tR2P?y2eV;cF_*klg7b}t-x?kM~!7T z4*Qa!v51~XY|+yiaktZGM|N*v0w$kvc)2ciYUR)>V6wWBG+iEgQbeKy14Ee%?a%9q zPeEobM3%!)trSu+5M;`(2>^ zryPK!7OS|V>7hq5x{n5sPI56J&vt4MGZPWFnm{R?#cH?N1yQUupv!nAJGe8EXS~#1 zWIZPr02I$Ge8pDsBv|E5RbK%yF*NJk0FF|uHeuq)q&tu0ITg>xgEnt35OAk9Miik( zR=up(MsaK~_JcLnfzl+`n`yU(SV-9HbpXxpccwETXZi|R!H0E&Tum)2aQUPw+3T_p z0odu#OteJi`k?eOv|}Rptf%bM!X#YbMb+Zy0ZNKm3-UmG$kv=3nluM`f{<&)b$tdP zI(%3vfo9MZ)~Q8(Lt+Mjrj!9V?Xje60d&Xa)jE>m9RY9CWS6lbF5Riw7!9~e6{hAC zq9NXrFpzwtt8lth%^4w!#ll|=;2yrHO*CdKCYqT`PN#@CS~WSi z(JX58ps0JAjY17jx~?Sadi-3eGA)K_V(y%#NWK*!23cUs1s^cpAa^X(%W{4N4uK2{ zJ+~rZzB#J1oGcf3E+urMHsckjNsGgf?MdxeF-6OyWj-LT)1bhB;i5`{iJcZoQ<=1_ zgi<;xFkd60l9vT%1Ka{l5pdO=>BKT1D-CYy_u9G12`HRp{UXuIvJUZWeKN@lMWvj$ z?nW)QEw0&}C6|pT>K9cb5)F6A`4U}I5yhPf^GKd4BqF1;*#gx3kxbO5WSxv5w-V!7 ztDs7opgdYlM-h=iGtja`B5MVM3D)B5lEGZA$hqAEpI|?uekOrj=vjQ(NTyoddf* z^3G3hy?W^IA?N9f$NM+7BlMM%&po6(^-1QH4>xaqZhh*F2g~!n`r=PM*uQW3K6`oJ z+4Favy>Qo8?mZ^@=RWrQ{imvX`R$65-tg*skM9=#^1^|A{VT6&kAL)o;N)8mf4lqW z=pXlOG1`xtm)`wf_nUW|fM3ivG5-$nU11M?@~ar|TXXAcpZl-&r-MgMZGU`4*7O&z zc0T{d2M?X24ltile{tg(blX4pqn|_g_Sbi9T|wS%eE-;IpV)ot_ynuoM8E#)?VtVO z#L+XCo4b?QhY!4T;qUn;9@>A;^o5t6KKhL>=>OdH{txyf+}*cbIsNj@K>zk^Q z&SvHxZr<|UGx|L!_33*b`1i)MXF^vrO{aRB@MQ0FaQ33`#LRtP90Jk?z|LxMhfZv_l)F(#q%-%PTllQ%j{2%8dZb<+D literal 1746 zcmZY5?eE+K0l;w+2+8^*-~u5N1x_-4`rG-Vy=!}S#b|8rsqMABUVFVh%nf?ihiiL% zxL&VMLwsO?4A=-lR03OKh7LuhzT(LjCg`F|+%&#XqU7g7GG38@MuQ{Z`|~gO7~C7iHkj6c-LFPE$;=v?MO+&AzoKwfyS~}a* z?5Z9qcBML5K;3LH(o);5Yv70)CN0+x(ShDCc{tW=A2)o>LL~^{q^Mc4vU#?ddTf$bX@h7POQ_(%)~42v7t|E5 z5Di9lhx58yXHm>%TT3>9^Sr-o%dLoB=(Vl{mmt>>mvsm*b(&0Mt~(@3nRNR-X-R9c z-f%!C3&ti-7)sBc2dcRqLYrEx@3E*|AuVX!YUmNfE&{1oV?q#seqD$_c>)eozM1!k zJ~inFv47)1n*#n0}I#a6w2VI~ukx*f{T2#w)IIj8iRjRD%WJ;^P z8MzoE4&zrn{h2 zwwnRnZdU{~HMbC5!}4yQO`&oCP>=NyzJ0qYuNHz?La@nxSwX9*oV_{bepnL#@_@-9#6$HsDure_^t5p|4v070x zO@^bU^qRIJt4Q#~=sCT{EaD7yDp3IBE44;-1<%z|X@dMr;%K+WNG>4{gf*+hiKD4g z+^`hAyQw8`7>ZdXYGG5svpO@x($;Ry2tgyyeM8`7kyBOgN(`bq?+>?2up)L$CXsLsp+zzjPQyzp9*5^!nBTttdN=k8!xyT z6QWgB<{=Bivat=T69$7qU?LWMkQqf~St_6~WECizdJG85xw0N2%lbfUlvv5}bCCsh zcXumodfoQRely9;NVn`*_gZsiHmkY1nujz3Srf#;*^b8`9#H!l|K5@NK6B>o=r8}~ z{(IZ~m$vs^e&Dw|dikh$>K@WMe%U{G1<39?@T;%C^w#M&*tb*axe8C`upKl{MKxIF&dg_q7#PrmpE?cKb0$G00VZ!Q1! R@Y$gH`P=Uces=Sf{{c{BW4{0Z From 015af486145b1b83719532d383f718b3515ebbd5 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Tue, 24 Sep 2024 16:16:45 -0400 Subject: [PATCH 12/14] wifi: add VINATL --- common/wifi.nix | 1 + secrets/wifi.age | Bin 1771 -> 1800 bytes 2 files changed, 1 insertion(+) diff --git a/common/wifi.nix b/common/wifi.nix index e327a00b..088628be 100644 --- a/common/wifi.nix +++ b/common/wifi.nix @@ -48,6 +48,7 @@ "PERCguest" = mkWPA2WiFi "PERCguest" "$PERCguestPSK"; "Stargate-Discovery" = mkWPA2WiFi "Stargate-Discovery" "$StargateDiscoveryPSK"; "Taproom Public WiFi" = mkOpenWiFi "Taproom Public WiFi"; + "VINATL-Guest" = mkWPA2WiFi "VINATL-Guest" "$VINATLGuestPSK"; "wallace" = mkWPA2WiFi "wallace" "$wallacePSK"; "WeWorkWiFi" = mkEAPWiFi "WeWorkWiFi" "$WeWorkWiFiIdentity" "$WeWorkWiFiPassword" "mschapv2"; }; diff --git a/secrets/wifi.age b/secrets/wifi.age index 6ba49fb721a5ff25ab946b3aecfdebbe1a90dbb0..afbcb490667aeea36ce66efa47eea4669c0c6c5d 100644 GIT binary patch literal 1800 zcmZY8`>)#u6$fybfQ^i?b{()Gl|~@AQ>}~R*tw4BwtJn#aU9!;V>^x$RkXI_`29{| zJL)Ec)=ny=d$0#+0)%*!4wV5dlYjz4n+jvAn97D)(AWS?6jq>6=+LFA=+F250q1;l z&iNk2(3f>zi}P@51^&l_*Z}8HVfpT2l9SNV3oBRZuKhxJ}LVOc%oz9Ono+5hSM`0RYNLRseMI zjT#xdl!_NA+VN%~?8&8=ZZH#EbbQHR>K%t_&l9@g>M1;Jv9pFFItA1#s{-HibXTe+ zOj#RcLB)sx$7}H&BLQQMkhp$x5yDuoQG-Z_tr*3abU33qXX~9tpP#BVeqdCqZL8eT za>lLYUV2H3gc_OG+D*x*$=KOnpUkv083wdbJ%2@C15JDo*r6QZDpLBb&^A75rg*IX4%wb8EM$f5s?()4kpdXEDTyXT#IsA zX)!84WNB@H_G4@)Q`jQFr<6a}osF~kv7cAdqC}ek8B^^cJ7pu*^3Y^ZZpkCjBr+#S zn)4D^!iPg6q>P|2md0eGT3umrt1jUgAGFjVf`N4{p-qvVh+J)EmmS}Zi>{5pD2o)`2plMrNO*8wkMl133)Ptq{VFDIc0v} zwdEDFWKaRzvB{1C#u|lBt0TRKvq7702;2Bk1Z z3R6=@r%jb%@oOJ#;c=IgZF6yRRY6vtITXA$%hbuBuy(VQJSGLnaXhhj97?9 zJ#*>)lS`M+n&#>aJD)t1eZso>$oGEhn@it*vSi(UXa3as$qUZf?&}EtzM}^(zWCD^-q*c)um`>H(1FPg z`)pZ?h? zd(T@BzVwS9Z<+g|-#^uq^!y1Mn^@hi{Y z@x|{O$9LUzzjElEYd^mLrZ;^3Z>wkSdB-R3+_&}o-s%fWg>$b6>!%(%0d9Zd7@=(0 z@tfD7zu#JkxwnAr&wY5$thIRTW%+O>_daX9ar&FCbKCi^+T%y>x%<+?+rWGOGT05> zwCCz6=Uun$`+#xyxl8ep^&9d1|As1SFP>OjIQZ<*>z{os`PhMH?)YyH_|A#be|rAS iyAbN7v%B;o&!~^n^`(oCYyJD)zGcrb;~#$VjsF856Nc>o literal 1771 zcmZY8|Ige60mtzz7(>n>>Xv|$gwrA0a(UMFu3v-7)86%Z{d(j(l7)smf!u3(fu0?b91z)_A5M~gZQV1XVwLT2{UHKXB0BrHeE zY#@_6HMeFh47Zxi8g>^7EP2eW6l`eNmNfR)tR2P?y2eV;cF_*klg7b}t-x?kM~!7T z4*Qa!v51~XY|+yiaktZGM|N*v0w$kvc)2ciYUR)>V6wWBG+iEgQbeKy14Ee%?a%9q zPeEobM3%!)trSu+5M;`(2>^ zryPK!7OS|V>7hq5x{n5sPI56J&vt4MGZPWFnm{R?#cH?N1yQUupv!nAJGe8EXS~#1 zWIZPr02I$Ge8pDsBv|E5RbK%yF*NJk0FF|uHeuq)q&tu0ITg>xgEnt35OAk9Miik( zR=up(MsaK~_JcLnfzl+`n`yU(SV-9HbpXxpccwETXZi|R!H0E&Tum)2aQUPw+3T_p z0odu#OteJi`k?eOv|}Rptf%bM!X#YbMb+Zy0ZNKm3-UmG$kv=3nluM`f{<&)b$tdP zI(%3vfo9MZ)~Q8(Lt+Mjrj!9V?Xje60d&Xa)jE>m9RY9CWS6lbF5Riw7!9~e6{hAC zq9NXrFpzwtt8lth%^4w!#ll|=;2yrHO*CdKCYqT`PN#@CS~WSi z(JX58ps0JAjY17jx~?Sadi-3eGA)K_V(y%#NWK*!23cUs1s^cpAa^X(%W{4N4uK2{ zJ+~rZzB#J1oGcf3E+urMHsckjNsGgf?MdxeF-6OyWj-LT)1bhB;i5`{iJcZoQ<=1_ zgi<;xFkd60l9vT%1Ka{l5pdO=>BKT1D-CYy_u9G12`HRp{UXuIvJUZWeKN@lMWvj$ z?nW)QEw0&}C6|pT>K9cb5)F6A`4U}I5yhPf^GKd4BqF1;*#gx3kxbO5WSxv5w-V!7 ztDs7opgdYlM-h=iGtja`B5MVM3D)B5lEGZA$hqAEpI|?uekOrj=vjQ(NTyoddf* z^3G3hy?W^IA?N9f$NM+7BlMM%&po6(^-1QH4>xaqZhh*F2g~!n`r=PM*uQW3K6`oJ z+4Favy>Qo8?mZ^@=RWrQ{imvX`R$65-tg*skM9=#^1^|A{VT6&kAL)o;N)8mf4lqW z=pXlOG1`xtm)`wf_nUW|fM3ivG5-$nU11M?@~ar|TXXAcpZl-&r-MgMZGU`4*7O&z zc0T{d2M?X24ltile{tg(blX4pqn|_g_Sbi9T|wS%eE-;IpV)ot_ynuoM8E#)?VtVO z#L+XCo4b?QhY!4T;qUn;9@>A;^o5t6KKhL>=>OdH{txyf+}*cbIsNj@K>zk^Q z&SvHxZr<|UGx|L!_33*b`1i)MXF^vrO{aRB@MQ0FaQ33`#LRtP90Jk?z|LxMhfZv_l)F(#q%-%PTllQ%j{2%8dZb<+D From d09baf2e3b63ce31c2d5c4470cf95701b8776014 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Tue, 24 Sep 2024 21:29:56 -0400 Subject: [PATCH 13/14] flake: bump nixhw, nixpkgs --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index fa77133d..0fe9c7f7 100644 --- a/flake.lock +++ b/flake.lock @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1726836401, - "narHash": "sha256-MO/h4RV4Ho4g3W7h6xQkCu5X3wBD1YnziP1Sg/PCCyA=", + "lastModified": 1727183733, + "narHash": "sha256-JyOFDaIHTTpVp1uO/3M4md6KNIXXhcD8ztDlDST0VL8=", "owner": "alyraffauf", "repo": "nixhw", - "rev": "bd0c54e428c18213321a16f71ce0782d48c27350", + "rev": "42685325fa3ca92404b73221ffc8fae1e1671154", "type": "github" }, "original": { @@ -459,11 +459,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1726969270, + "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", "type": "github" }, "original": { From f757d87c686223a8e4ee19bf9b34baef027bd973 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Tue, 24 Sep 2024 23:15:08 -0400 Subject: [PATCH 14/14] aly/thunderbird: disable start page --- homes/aly/mail/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/aly/mail/default.nix b/homes/aly/mail/default.nix index 5918424f..37efd141 100644 --- a/homes/aly/mail/default.nix +++ b/homes/aly/mail/default.nix @@ -77,6 +77,7 @@ in { "mailnews.default_sort_order" = 2; # descending, 1 for ascending "mailnews.default_sort_type" = 18; # sort by date "mailnews.message_display.disable_remote_image" = false; + "mailnews.start_page.enabled" = false; "network.cookie.cookieBehavior" = 2; # no cookies "pdfjs.enabledCache.state" = true; "privacy.donottrackheader.enabled" = true;