From 1d9dd09138fedf884ea01c5ce091d8c93dda08e3 Mon Sep 17 00:00:00 2001 From: nydragon Date: Fri, 4 Apr 2025 22:38:05 +0200 Subject: [PATCH] chore: random stuff --- flake.lock | 6 +++--- home/default.nix | 2 -- home/graphical/firefox/default.nix | 8 ++++---- home/hyprland/default.nix | 1 - home/hyprpaper/default.nix | 15 --------------- home/services/default.nix | 1 - home/services/syncthing.nix | 19 ------------------- hosts/brontes/default.nix | 6 ++++++ hosts/brontes/home.nix | 7 ------- hosts/default.nix | 10 ++++++++++ hosts/marr/default.nix | 4 ++++ hosts/marr/home.nix | 4 ---- hosts/raptus/headscale/acls.nix | 1 - options/system/outputs.nix | 2 +- options/system/users/default.nix | 4 ++-- users/ny/programs/default.nix | 1 + .../ny/programs/hyprlock.nix | 6 +++--- 17 files changed, 34 insertions(+), 63 deletions(-) delete mode 100644 home/hyprpaper/default.nix delete mode 100644 home/services/syncthing.nix rename home/hyprlock/default.nix => users/ny/programs/hyprlock.nix (89%) diff --git a/flake.lock b/flake.lock index cdd4333..fc48660 100644 --- a/flake.lock +++ b/flake.lock @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1742931706, - "narHash": "sha256-VDTJkTR3I6RCXodtldF5mfXDjgtKiAGdau0Nf+NnEow=", + "lastModified": 1743618206, + "narHash": "sha256-2m+NSilel93Kmafb1ghS+7T6kxmesKynWEqsVXIxj/k=", "owner": "nydragon", "repo": "hjem-rum", - "rev": "b1f8e2de6d15baafe4ed81c491b1eaa1eb182128", + "rev": "c365017ca78d21ffcf0e785332b04bdbbd96c284", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 12b2fdc..22f9a75 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,12 +6,10 @@ ./terminal ./desktop ./hyprland - ./hyprlock ./services ./rofi ./sway ./waybar - ./hyprpaper ./swaync ]; } diff --git a/home/graphical/firefox/default.nix b/home/graphical/firefox/default.nix index 951e20e..b40a19c 100644 --- a/home/graphical/firefox/default.nix +++ b/home/graphical/firefox/default.nix @@ -44,13 +44,13 @@ lib.mkIf osConfig.programs.firefox.enable { urls = [ { template = "https://wiki.archlinux.org/index.php?title=Special:Search&search={searchTerms}"; } ]; - iconUpdateURL = "https://wiki.archlinux.org/favicon.ico"; + icon = "https://wiki.archlinux.org/favicon.ico"; updateInterval = iconUpdateInterval; definedAliases = [ "@archwiki" ]; }; "DuckDuckGo" = { urls = [ { template = "https://duckduckgo.com/?q={searchTerms}"; } ]; - iconUpdateURL = "https://duckduckgo.com/favicon.ico"; + icon = "https://duckduckgo.com/favicon.ico"; updateInterval = iconUpdateInterval; definedAliases = [ "@duckduckgo" @@ -59,7 +59,7 @@ lib.mkIf osConfig.programs.firefox.enable { }; "MyNixOS" = { urls = [ { template = "https://mynixos.com/search?q={searchTerms}"; } ]; - iconUpdateURL = "https://mynixos.com/favicon.ico"; + icon = "https://mynixos.com/favicon.ico"; updateInterval = iconUpdateInterval; definedAliases = [ "@hm" @@ -68,7 +68,7 @@ lib.mkIf osConfig.programs.firefox.enable { }; "stackoverflow" = { urls = [ { template = "https://stackoverflow.com/search?q={searchTerms}"; } ]; - iconUpdateURL = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico"; + icon = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico"; updateInterval = iconUpdateInterval; definedAliases = [ "@stackoverflow" ]; }; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 1469abb..be5fce7 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -15,7 +15,6 @@ in mkIf osConfig.programs.hyprland.enable { home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto"; - programs.hyprlock.enable = true; services.swayidle.enable = true; wayland.windowManager.hyprland = { diff --git a/home/hyprpaper/default.nix b/home/hyprpaper/default.nix deleted file mode 100644 index 18c0aa1..0000000 --- a/home/hyprpaper/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ inputs, ... }: -{ - services.hyprpaper = { - enable = false; - settings = - let - wp = inputs.wallpapers.wallpapers.pastel.nix-flake.path; - in - { - ipc = "on"; - preload = [ "${wp}" ]; - wallpaper = [ ",${wp}" ]; - }; - }; -} diff --git a/home/services/default.nix b/home/services/default.nix index a17da37..229e9d3 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -1,6 +1,5 @@ { imports = [ ./kdeconnect.nix - ./syncthing.nix ]; } diff --git a/home/services/syncthing.nix b/home/services/syncthing.nix deleted file mode 100644 index 62359cd..0000000 --- a/home/services/syncthing.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: -let - inherit (lib) mkIf; -in -{ - config = mkIf config.services.syncthing.enable { - xdg.desktopEntries."Syncthing" = { - name = "Syncthing"; - icon = ""; - terminal = false; - exec = "${pkgs.syncthing}/bin/syncthing --browser-only"; - }; - }; -} diff --git a/hosts/brontes/default.nix b/hosts/brontes/default.nix index 262962c..2e72ab3 100644 --- a/hosts/brontes/default.nix +++ b/hosts/brontes/default.nix @@ -19,6 +19,8 @@ in efi.canTouchEfiVariables = true; }; + zramSwap.enable = true; + age.secrets.rustypaste = { file = ../../secrets/rustypaste.age; mode = "440"; @@ -111,6 +113,10 @@ in }; programs = { + direnv = { + nix-direnv.enable = true; + enable = true; + }; dconf.enable = true; fish.enable = true; firefox.enable = true; diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix index a54a730..6030ab5 100644 --- a/hosts/brontes/home.nix +++ b/hosts/brontes/home.nix @@ -18,15 +18,8 @@ in ]; programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - }; - beets.enable = true; - waybar.enable = true; ssh.enable = true; - rofi.enable = true; }; services = { diff --git a/hosts/default.nix b/hosts/default.nix index 72dafda..5045858 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -62,5 +62,15 @@ in inputs.nixos-hardware.nixosModules.raspberry-pi-4 ]; }) + + (mkSystem' { + inherit username; + hostname = "ashla"; + system = "x86_64-linux"; + extraModules = [ + inputs.disko.nixosModules.disko + inputs.agenix.nixosModules.default + ]; + }) ]; } diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix index 310339d..e26dba5 100644 --- a/hosts/marr/default.nix +++ b/hosts/marr/default.nix @@ -85,6 +85,10 @@ in }; programs = { + direnv = { + nix-direnv.enable = true; + enable = true; + }; dconf.enable = true; fish.enable = true; firefox.enable = true; diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix index fdfb3ee..ad0dba3 100644 --- a/hosts/marr/home.nix +++ b/hosts/marr/home.nix @@ -26,10 +26,6 @@ in }; programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - }; beets.enable = true; vscode.enable = true; ssh.enable = true; diff --git a/hosts/raptus/headscale/acls.nix b/hosts/raptus/headscale/acls.nix index ea18765..14d6576 100644 --- a/hosts/raptus/headscale/acls.nix +++ b/hosts/raptus/headscale/acls.nix @@ -1,6 +1,5 @@ { pkgs, - options, lib, self, ... diff --git a/options/system/outputs.nix b/options/system/outputs.nix index 93cdd48..c93d42d 100644 --- a/options/system/outputs.nix +++ b/options/system/outputs.nix @@ -13,7 +13,7 @@ in options.modules.system.outputs = mkOption { type = attrsOf ( submodule ( - { name, config, ... }: + { name, ... }: { options = { name = mkOption { diff --git a/options/system/users/default.nix b/options/system/users/default.nix index ef7bf20..98bb03b 100644 --- a/options/system/users/default.nix +++ b/options/system/users/default.nix @@ -16,7 +16,7 @@ let cfg = config.modules.system.users; file = submodule ( - { name, config, ... }: + { ... }: { options = { path = mkOption { @@ -37,7 +37,7 @@ in default = { }; type = attrsOf ( submodule ( - { name, config, ... }: + { name, ... }: { options = { name = mkOption { diff --git a/users/ny/programs/default.nix b/users/ny/programs/default.nix index 4b78660..a22ccb3 100644 --- a/users/ny/programs/default.nix +++ b/users/ny/programs/default.nix @@ -4,5 +4,6 @@ ./fuzzel.nix ./keepassxc.nix ./git.nix + ./hyprlock.nix ]; } diff --git a/home/hyprlock/default.nix b/users/ny/programs/hyprlock.nix similarity index 89% rename from home/hyprlock/default.nix rename to users/ny/programs/hyprlock.nix index 3a54ac5..2d27e6f 100644 --- a/home/hyprlock/default.nix +++ b/users/ny/programs/hyprlock.nix @@ -1,6 +1,6 @@ -{ lib, config, ... }: -lib.mkIf config.programs.hyprlock.enable { - programs.hyprlock = { +{ + rum.programs.hyprlock = { + enable = true; settings = { general = { hide_cursor = true;