From ed7b484260ab1e853e7b70093a37386179fc2095 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 30 Dec 2025 00:28:00 -0600 Subject: [PATCH 01/11] tracking upstream changes --- hosts/pi-server/upgrade-diff.nix | 2 +- hosts/server/upgrade-diff.nix | 2 +- nixos-anywhere/configuration.nix | 2 +- nixos-anywhere/flake.nix | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/pi-server/upgrade-diff.nix b/hosts/pi-server/upgrade-diff.nix index 1903966..a74504e 100644 --- a/hosts/pi-server/upgrade-diff.nix +++ b/hosts/pi-server/upgrade-diff.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - system.activationScripts.diff = { + stdenv.hostPlatform.system.activationScripts.diff = { supportsDryActivation = true; text = '' ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" diff --git a/hosts/server/upgrade-diff.nix b/hosts/server/upgrade-diff.nix index 1903966..a74504e 100644 --- a/hosts/server/upgrade-diff.nix +++ b/hosts/server/upgrade-diff.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - system.activationScripts.diff = { + stdenv.hostPlatform.system.activationScripts.diff = { supportsDryActivation = true; text = '' ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" diff --git a/nixos-anywhere/configuration.nix b/nixos-anywhere/configuration.nix index 8115b33..b7d87bc 100644 --- a/nixos-anywhere/configuration.nix +++ b/nixos-anywhere/configuration.nix @@ -61,5 +61,5 @@ ] ++ (args.extraPublicKeys or []); # this is used for unit-testing this module and can be removed if not needed - system.stateVersion = "25.11"; + stdenv.hostPlatform.system.stateVersion = "25.11"; } diff --git a/nixos-anywhere/flake.nix b/nixos-anywhere/flake.nix index 2d524a9..7090932 100644 --- a/nixos-anywhere/flake.nix +++ b/nixos-anywhere/flake.nix @@ -13,7 +13,7 @@ }: { nixosConfigurations.hetzner-cloud = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + stdenv.hostPlatform.system = "x86_64-linux"; modules = [ disko.nixosModules.disko ./configuration.nix @@ -21,7 +21,7 @@ }; # tested with 2GB/2CPU droplet, 1GB droplets do not have enough RAM for kexec nixosConfigurations.digitalocean = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + stdenv.hostPlatform.system = "x86_64-linux"; modules = [ ./digitalocean.nix disko.nixosModules.disko @@ -30,7 +30,7 @@ ]; }; nixosConfigurations.hetzner-cloud-aarch64 = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; + stdenv.hostPlatform.system = "aarch64-linux"; modules = [ disko.nixosModules.disko ./configuration.nix @@ -40,7 +40,7 @@ # Use this for all other targets # nixos-anywhere --flake .#generic --generate-hardware-config nixos-generate-config ./hardware-configuration.nix nixosConfigurations.generic = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + stdenv.hostPlatform.system = "x86_64-linux"; modules = [ disko.nixosModules.disko ./configuration.nix @@ -51,7 +51,7 @@ # Slightly experimental: Like generic, but with nixos-facter (https://github.com/numtide/nixos-facter) # nixos-anywhere --flake .#generic-nixos-facter --generate-hardware-config nixos-facter facter.json nixosConfigurations.generic-nixos-facter = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + stdenv.hostPlatform.system = "x86_64-linux"; modules = [ disko.nixosModules.disko ./configuration.nix From dfa12b5b4da5ac20d4c927a7cf02336604b459eb Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 30 Dec 2025 00:45:40 -0600 Subject: [PATCH 02/11] host/workstation/default | remove old options --- hosts/workstation/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index 6b01506..d86cde9 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -206,8 +206,6 @@ in { package = pkgs.mlocate; }; logind = { - lidSwitchDocked = "ignore"; - lidSwitchExternalPower = "ignore"; settings = { Login = { HandleLidSwitchDocked = "ignore"; From a7ed904dca80a3e6d1d7cf64aa6923659a8bc8f7 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Thu, 1 Jan 2026 15:08:40 -0600 Subject: [PATCH 03/11] pi-server | revert --- hosts/pi-server/upgrade-diff.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/pi-server/upgrade-diff.nix b/hosts/pi-server/upgrade-diff.nix index a74504e..d6a33f0 100644 --- a/hosts/pi-server/upgrade-diff.nix +++ b/hosts/pi-server/upgrade-diff.nix @@ -1,5 +1,5 @@ -{ pkgs, ... }: { - stdenv.hostPlatform.system.activationScripts.diff = { +{pkgs, ...}: { + system.activationScripts.diff = { supportsDryActivation = true; text = '' ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" From cc8905a4d2a4fc859911a1b7381d4b3c6cd73917 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Thu, 1 Jan 2026 15:08:47 -0600 Subject: [PATCH 04/11] add sshfs --- hosts/server/default.nix | 1 + hosts/workstation/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/server/default.nix b/hosts/server/default.nix index 0af46d8..97a6b27 100644 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -183,6 +183,7 @@ in { podman poppler-utils ruby + sshfs sops udiskie ]; diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index d86cde9..e6ee759 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -347,6 +347,7 @@ in { poppler-utils pulseaudio ruby + sshfs sops termsonic # toot From 46f468b632163fb2df6115808bd9c36c4f632ff2 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 4 Jan 2026 08:57:20 -0600 Subject: [PATCH 05/11] hosts/workstation | added back older style for logind lid switch as new ones do not work --- hosts/workstation/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index e6ee759..2fba195 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -206,6 +206,8 @@ in { package = pkgs.mlocate; }; logind = { + lidSwitchDocked = "ignore"; + lidSwitchExternalPower = "ignore"; settings = { Login = { HandleLidSwitchDocked = "ignore"; From 4080e530ebad8092c02d11faf3a22aac0a46470f Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 4 Jan 2026 08:58:03 -0600 Subject: [PATCH 06/11] home/mpv | add flag to tell yt-dlp to mark video watched --- home/gui/mpv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/gui/mpv.nix b/home/gui/mpv.nix index a988f58..803afb3 100644 --- a/home/gui/mpv.nix +++ b/home/gui/mpv.nix @@ -35,8 +35,8 @@ ytdl = "yes"; ytdl-format = "bestvideo+bestaudio"; # Only needed when/if youtube blocks annon access again - # ytdl-raw-options = "no-playlist=,cookies-from-browser=firefox,force-ipv4="; - ytdl-raw-options = "no-playlist=,force-ipv4="; + # ytdl-raw-options = "mark-watched=,no-playlist=,cookies-from-browser=firefox,force-ipv4="; + ytdl-raw-options = "mark-watched=,no-playlist=,force-ipv4="; }; profiles = { utube = { From f33943bfa0be395ce945aebddc15bee7cc6f4302 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 4 Jan 2026 08:58:48 -0600 Subject: [PATCH 07/11] home/sway | cleanup, remove pasystray as no longer working, do not install yt-dlp from nix --- home/gui/default.nix | 3 +-- home/gui/sway.nix | 14 +++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/home/gui/default.nix b/home/gui/default.nix index 88f2fa7..1b256d4 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -57,7 +57,6 @@ in { nvd obsidian overpass - pasystray pavucontrol pwvucontrol qpwgraph @@ -74,7 +73,7 @@ in { # watchmate widevine-cdm wlsunset - yt-dlp + # yt-dlp ]; # ] ++ lib.optional (pkgs.hostPlatform.system == "x86_64-linux") feishin; # ] ++ lib.optional (pkgs.hostPlatform.system == "x86_64-linux") sonixd; diff --git a/home/gui/sway.nix b/home/gui/sway.nix index 5680dc8..058075a 100644 --- a/home/gui/sway.nix +++ b/home/gui/sway.nix @@ -38,17 +38,17 @@ title_align center # Music control bindsym XF86AudioPlay exec --no-startup-id control-music --pause - bindsym Control+Shift+F7 exec --no-startup-id control-music --pause bindsym XF86AudioNext exec --no-startup-id control-music --next - bindsym Control+Shift+F2 exec --no-startup-id control-music --next bindsym XF86AudioPrev exec --no-startup-id control-music --prev - bindsym Control+Shift+F1 exec --no-startup-id control-music --prev bindsym XF86AudioStop exec --no-startup-id control-music --stop + bindsym Control+Shift+F7 exec --no-startup-id control-music --pause + bindsym Control+Shift+F2 exec --no-startup-id control-music --next + bindsym Control+Shift+F1 exec --no-startup-id control-music --prev # Brightness bindsym XF86MonBrightnessDown exec light -U 10 - bindsym Control+Shift+F5 exec light -U 10 bindsym XF86MonBrightnessUp exec light -A 10 + bindsym Control+Shift+F5 exec light -U 10 bindsym Control+Shift+F6 exec light -A 10 # Volume @@ -82,7 +82,6 @@ bindsym menu exec $menu_command bindsym $mod+Shift+w exec dwifi bindsym $mod+d exec --no-startup-id $menu - bindsym $mod+t exec --no-startup-id $HOME/bin/mynewterm -e ttmenu # change focus bindsym $mod+j focus left @@ -303,7 +302,6 @@ client.placeholder #282A36 #282A36 #F8F8F2 #282A36 #282A36 client.background #F8F8F2 - exec ${pkgs.pasystray}/bin/pasystray exec_always ${pkgs.keyutils}/bin/keyctl link @u @s exec ${pkgs.shikane}/bin/shikane exec ${pkgs.wayland-pipewire-idle-inhibit}/bin/wayland-pipewire-idle-inhibit @@ -314,8 +312,6 @@ exec ${pkgs.dbus}/bin/dbus-update-activation-environment --all 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK exec ${pkgs.udiskie}/bin/udiskie exec ${pkgs.wl-clipboard}/bin/wl-paste -t text --watch clipman store - exec ~/bin/configure-gtk - exec ~/bin/dovideo.sh exec ~/bin/auto-start exec ${pkgs.sway-audio-idle-inhibit}/bin/sway-audio-idle-inhibit exec ${pkgs.swaynotificationcenter}/bin/swaync @@ -325,7 +321,7 @@ exec ~/bin/myterm exec ${pkgs.headset-charge-indicator}/bin/headset-charge-indicator.py exec ${pkgs.wlsunset}/bin/wlsunset -l 29.7 -L -95.8 - exec ${pkgs.blueberry}/bin/blueberry-tray + # exec ${pkgs.blueberry}/bin/blueberry-tray ''; programs = { From 5a0ece7206c49d803cab70db96f17ff4b06d11d1 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 4 Jan 2026 22:47:45 -0600 Subject: [PATCH 08/11] home | switch from nvf back to nixvim --- flake.lock | 169 ++++++++++++++++++++++++++++++++++++++-- flake.nix | 2 + home/common/default.nix | 3 +- home/common/nvf.nix | 34 ++++---- home/default.nix | 4 +- 5 files changed, 188 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index fec61c6..bf2fbdf 100644 --- a/flake.lock +++ b/flake.lock @@ -132,6 +132,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nvf", @@ -203,6 +224,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": [ @@ -254,6 +293,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.1.1", + "repo": "ixx", + "type": "github" + } + }, "mnw": { "locked": { "lastModified": 1758834834, @@ -290,7 +357,7 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1765720983, @@ -507,6 +574,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1767325753, + "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1764242076, "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", @@ -522,7 +605,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1766125104, "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", @@ -538,16 +621,61 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_7", + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_4" + }, + "locked": { + "lastModified": 1767448089, + "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "983751b66f255bbea1adc185364e9e7b73f82358", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "nixos-25.11", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_4", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", + "owner": "NuschtOS", + "repo": "search", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "nvf": { "inputs": { "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "mnw": "mnw", "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1766596669, @@ -574,6 +702,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable", + "nixvim": "nixvim", "nvf": "nvf", "sops-nix": "sops-nix" } @@ -598,7 +727,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1766289575, @@ -674,6 +803,36 @@ "repo": "default", "type": "github" } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cb94e4e..40d47a0 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,8 @@ nixConfig = {allowUnfree = true;}; inputs = { + # nixvim.url = "github:nix-community/nixvim"; + nixvim.url = "github:nix-community/nixvim/nixos-25.11"; # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; sops-nix.url = "github:Mic92/sops-nix"; diff --git a/home/common/default.nix b/home/common/default.nix index b278d87..617ad17 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -19,7 +19,8 @@ ./mail.nix ./naviterm.nix ./newsboat.nix - ./nvf.nix + ./nixvim.nix + # ./nvf.nix ./ssh.nix ./taskwarrior.nix ./topgrade.nix diff --git a/home/common/nvf.nix b/home/common/nvf.nix index c49d552..a5f97d4 100644 --- a/home/common/nvf.nix +++ b/home/common/nvf.nix @@ -1,9 +1,10 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ tree-sitter fd ripgrep ]; +{pkgs, ...}: { + home.packages = with pkgs; [tree-sitter fd ripgrep]; programs.nvf = { enable = true; enableManpages = true; settings = { + # https://nvf.notashelf.dev/options.html vim = { luaConfigPost = '' vim.o.tabstop = 2 @@ -14,12 +15,12 @@ vim.o.sidescrolloff = 8 ''; autocomplete.blink-cmp.enable = true; - binds = { cheatsheet.enable = true; }; + binds = {cheatsheet.enable = true;}; dashboard.alpha = { enable = true; theme = "dashboard"; }; - filetree.neo-tree = { enable = true; }; + filetree.neo-tree = {enable = true;}; comments.comment-nvim.enable = true; autopairs.nvim-autopairs.enable = true; snippets.luasnip.enable = true; @@ -31,7 +32,7 @@ terminal = { toggleterm = { enable = true; - lazygit = { enable = true; }; + lazygit = {enable = true;}; }; }; treesitter = { @@ -39,48 +40,49 @@ context.enable = true; fold = true; autotagHtml.enable = true; + indent.enable = true; }; syntaxHighlighting = true; keymaps = [ { key = ""; action = ":bnext"; - mode = [ "n" ]; + mode = ["n"]; } { key = "t"; action = ":Telescope buffers"; - mode = [ "n" ]; + mode = ["n"]; } { key = "T"; action = ":terminal"; - mode = [ "n" ]; + mode = ["n"]; } { key = "e"; action = ":Neotree toggle"; - mode = [ "n" ]; + mode = ["n"]; } { key = "ow"; action = ":ObsidianWorkspace"; - mode = [ "n" ]; + mode = ["n"]; } { key = "od"; action = ":ObsidianDailies"; - mode = [ "n" ]; + mode = ["n"]; } { key = "on"; action = ":ObsidianNew"; - mode = [ "n" ]; + mode = ["n"]; } { key = "oN"; action = ":ObsidianNewFromTemplate"; - mode = [ "n" ]; + mode = ["n"]; } ]; git = { @@ -117,9 +119,9 @@ codewindow.enable = true; }; - notify = { nvim-notify.enable = true; }; + notify = {nvim-notify.enable = true;}; - options = { conceallevel = 1; }; + options = {conceallevel = 1;}; statusline.lualine = { enable = true; @@ -141,7 +143,7 @@ legacy_commands = true; ui.enable = false; completion.nvim-cmp = true; - templates = { subdir = "Templates"; }; + templates = {subdir = "Templates";}; daily_notes = { date_format = "%Y-%m-%d"; folder = "Daily"; diff --git a/home/default.nix b/home/default.nix index 16e99d1..cac1cb3 100644 --- a/home/default.nix +++ b/home/default.nix @@ -19,8 +19,8 @@ don = { imports = [ inputs.catppuccin.homeModules.catppuccin - inputs.nvf.homeManagerModules.default - # inputs.nixvim.homeModules.nixvim + # inputs.nvf.homeManagerModules.default + inputs.nixvim.homeModules.nixvim ./common ]; home = { From ea5c9e1f3db93dba4915376d038a165f2811f06e Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 6 Jan 2026 23:25:58 -0600 Subject: [PATCH 09/11] home/gui | remove unused files --- home/gui/fuzzel.nix | 21 --------------------- home/gui/redshift.nix | 21 --------------------- 2 files changed, 42 deletions(-) delete mode 100644 home/gui/fuzzel.nix delete mode 100644 home/gui/redshift.nix diff --git a/home/gui/fuzzel.nix b/home/gui/fuzzel.nix deleted file mode 100644 index eb4d3ef..0000000 --- a/home/gui/fuzzel.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, pkgs, ... }: { - home.packages = with pkgs; [ fuzzel ]; - programs.fuzzel = { - enable = true; - settings = { - main = { - icon-theme = "Papirus-Dark"; - width = 50; - # font = "Ubuntu:style=Bold:size=12, Hack:weight=bold:size=12"; - fields = "name,generic,comment,categories,filename,keywords"; - prompt = "❯ "; - layer = "overlay"; - }; - border = { radius = 20; }; - dmenu = { - exit-immediately-if-empty = true; - mode = "index"; - }; - }; - }; -} diff --git a/home/gui/redshift.nix b/home/gui/redshift.nix deleted file mode 100644 index d732781..0000000 --- a/home/gui/redshift.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, pkgs, ... }: { - services.redshift = { - enable = true; - latitude = "29.74"; - longitude = "-95.77"; - provider = "manual"; - settings = { - redshift = { - tray = true; - adjustment-method = "vidmode"; - brightness-day = "1.0"; - brightness-night = "0.7"; - # This *should work* - #temperature = { - #day = 6500; - #night = 3500; - #}; - }; - }; - }; -} From ce2854ed04d3f5b87612daf3cab95de71d1e10b3 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 6 Jan 2026 23:26:59 -0600 Subject: [PATCH 10/11] home/gui | switch firefox -> librewolf, add extensions. WIP --- home/common/default.nix | 1 - home/gui/default.nix | 5 ++- home/gui/librewolf.nix | 73 ++++++++++++++++++++++++++++++++++++++++ home/gui/qutebrowser.nix | 1 + 4 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 home/gui/librewolf.nix diff --git a/home/common/default.nix b/home/common/default.nix index 617ad17..ea39dc6 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -66,7 +66,6 @@ keychain keyutils lazygit - librewolf links2 liquidprompt lynx diff --git a/home/gui/default.nix b/home/gui/default.nix index 1b256d4..8fc0d50 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -14,10 +14,9 @@ in { imports = [ ./alacritty.nix ./autostart.nix - # ./fuzzel.nix # ./kde.nix + ./librewolf.nix ./mpv.nix - # ./redshift.nix ./qutebrowser.nix ./services.nix ./sway.nix @@ -41,7 +40,7 @@ in { clipman darktable # element-desktop - firefox + # firefox gnumeric headset-charge-indicator ibm-plex diff --git a/home/gui/librewolf.nix b/home/gui/librewolf.nix new file mode 100644 index 0000000..db73eb6 --- /dev/null +++ b/home/gui/librewolf.nix @@ -0,0 +1,73 @@ +{ + config, + pkgs, + ... +}: { + programs.firefox = { + enable = true; + package = pkgs.librewolf; + policies = { + Cookies = { + "Allow" = [ + "https://addy.io" + "https://element.io" + "https://discord.com" + "https://github.com" + "https://lemmy.cafe" + "https://proton.me" + ]; + "Locked" = true; + }; + DisableTelemetry = true; + DisableFirefoxStudies = true; + ExtensionSettings = { + # Catpuccin Mocha - Lavender + "{8446b178-c865-4f5c-8ccc-1d7887811ae3}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-mocha-lavender-git/latest.xpi"; + installation_mode = "force_installed"; + }; + # Tridactyl + "tridactyl.vim@cmcaine.co.uk" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi"; + installation_mode = "force_installed"; + }; + # uBlock Origin + "uBlock0@raymondhill.net" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + installation_mode = "force_installed"; + }; + # Bitwarden + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; + installation_mode = "force_installed"; + }; + # Dark Reader + "addon@darkreader.org" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi"; + installation_mode = "force_installed"; + }; + }; + FirefoxHome = { + "Search" = false; + }; + HardwareAcceleration = true; + Preferences = { + "browser.preferences.defaultPerformanceSettings.enabled" = false; + "browser.startup.homepage" = "about:home"; + "browser.toolbar.bookmarks.visibility" = "newtab"; + "browser.toolbars.bookmarks.visibility" = "newtab"; + "browser.urlbar.suggest.bookmark" = false; + "browser.urlbar.suggest.engines" = false; + "browser.urlbar.suggest.history" = false; + "browser.urlbar.suggest.openpage" = false; + "browser.urlbar.suggest.recentsearches" = false; + "browser.urlbar.suggest.topsites" = false; + "browser.warnOnQuit" = false; + "browser.warnOnQuitShortcut" = false; + "places.history.enabled" = "false"; + "privacy.resistFingerprinting" = true; + "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true; + }; + }; + }; +} diff --git a/home/gui/qutebrowser.nix b/home/gui/qutebrowser.nix index 7205429..dcf1ba6 100644 --- a/home/gui/qutebrowser.nix +++ b/home/gui/qutebrowser.nix @@ -57,6 +57,7 @@ cnn = "https://www.cnn.com"; crhs = "https://www.katyisd.org/CRHS"; crhs-absence = "https://www.katyisd.org/domain/5809"; + cultpens = "https://cultpens.com/"; cups = "http://localhost:631/printers/printer"; disk = "https://smart.trex-halfbeak.ts.net/web/dashboard"; ercot = "https://www.ercot.com/gridmktinfo/dashboards"; From 489e494aacf193299fe01f805ad2637f16a981f6 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 6 Jan 2026 23:27:20 -0600 Subject: [PATCH 11/11] home-manager | set to pull from 25.11 --- flake.lock | 7 ++++--- flake.nix | 4 ++-- home/default.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bf2fbdf..9aceb66 100644 --- a/flake.lock +++ b/flake.lock @@ -280,15 +280,16 @@ ] }, "locked": { - "lastModified": 1766682973, - "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", + "lastModified": 1767619900, + "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=", "owner": "nix-community", "repo": "home-manager", - "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", + "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index 40d47a0..c0403c6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,4 @@ -{ + { description = "NixOS System Configuration for duckland.org"; # Binary cache configuration for faster builds @@ -19,7 +19,7 @@ catppuccin.url = "github:catppuccin/nix"; colmena.url = "github:zhaofengli/colmena"; colmena.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; naviterm.url = "gitlab:detoxify92/naviterm"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/home/default.nix b/home/default.nix index cac1cb3..d1f132c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -26,7 +26,7 @@ home = { username = "don"; homeDirectory = "/home/don"; - stateVersion = "23.05"; + stateVersion = "25.11"; }; programs = { home-manager = {enable = true;};