From 841c06b106ad501643c35f48f2ced1c2d6a78641 Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Mon, 6 Oct 2025 16:05:07 -0700 Subject: working version before flake update --- nix/flake.lock | 48 ++++++++++++++++++------------------- nix/modules/configuration.nix | 11 +++------ nix/modules/home/default.nix | 1 + nix/modules/home/gtk.nix | 8 +++++++ nix/modules/home/hyprland.nix | 25 ++++++++++++++----- nix/modules/home/kitty.nix | 2 +- nix/systems/spontaneity/default.nix | 6 +++++ 7 files changed, 62 insertions(+), 39 deletions(-) create mode 100644 nix/modules/home/gtk.nix (limited to 'nix') diff --git a/nix/flake.lock b/nix/flake.lock index d6f8b15..e9b2a80 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1758313341, - "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1758163506, - "narHash": "sha256-eGksZmv1ie834yfgJW0z85eZZo10A/JE+6dhHNWQajQ=", + "lastModified": 1758768328, + "narHash": "sha256-PSg4x8RopDaQ1fkAA9bkmNoSQny373LPwTb/VzlR4uY=", "owner": "nixpak", "repo": "nixpak", - "rev": "17df00be4383dbf88c42ed1fa519cc6dd71df042", + "rev": "d0a874ed12135081dfeed555eed8107ac55b01be", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -477,11 +477,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -493,11 +493,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757746433, - "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", + "lastModified": 1758976413, + "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", + "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", "type": "github" }, "original": { @@ -513,11 +513,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758314668, - "narHash": "sha256-UeSA8UbYgBeeI/r6YRlkwKrBMhnE2ZliSFb7QB7p4zQ=", + "lastModified": 1759032479, + "narHash": "sha256-SHa7Pw3bQVZZ41FDf0b6SfSHHx4GzNQRAbHQmQWwSEA=", "owner": "nix-community", "repo": "NUR", - "rev": "180ae0f66d4d50d36c01e750bd7c05f49ff8f24b", + "rev": "eb0a72b223db0a0a9095ac53b375148e5f868775", "type": "github" }, "original": { @@ -643,11 +643,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1758007585, - "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", + "lastModified": 1759030640, + "narHash": "sha256-53VP3BqMXJqD1He1WADTFyUnpta3mie56H7nC59tSic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", + "rev": "9ac51832c70f2ff34fcc97b05fa74b4a78317f9e", "type": "github" }, "original": { @@ -738,11 +738,11 @@ }, "wallpapers": { "locked": { - "lastModified": 1710138216, - "narHash": "sha256-LcgB1Fkb9PZLF9BiV310mSWe3emK1+aJ2gxkeSsuOQ4=", + "lastModified": 1759390995, + "narHash": "sha256-u3MP+vb4DXbuEo6B8zVesG6t6MCtG9vFjp7Cxsazlxs=", "owner": "ret2pop", "repo": "wallpapers", - "rev": "18edf36b53936ee2eda766b7b29ee91b21e2d5cd", + "rev": "3b88e204405fd594581b7d988abad9dc7e593884", "type": "github" }, "original": { diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index e87f406..749d725 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -22,7 +22,6 @@ ./znc.nix ./docker.nix ./impermanence.nix - ./firejail.nix ]; documentation = { @@ -87,7 +86,7 @@ }; loader = { - systemd-boot.enable = lib.mkForce ((! config.monorepo.profiles.grub.enable) || (! config.monorepo.profiles.secureBoot.enable)); + systemd-boot.enable = lib.mkForce ((! config.monorepo.profiles.grub.enable) && (! config.monorepo.profiles.secureBoot.enable)); efi.canTouchEfiVariables = lib.mkForce (! config.monorepo.profiles.grub.enable); }; @@ -189,12 +188,8 @@ }; networking = { - useDHCP = false; - dhcpcd.enable = false; - nameservers = [ - "1.1.1.1" - "8.8.8.8" - ]; + nameservers = [ "8.8.8.8" "1.1.1.1"]; + dhcpcd.enable = (! config.monorepo.profiles.server.enable); networkmanager = { enable = true; wifi.powersave = false; diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index f5f8d34..c3bcfbf 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -21,6 +21,7 @@ ./mpd.nix ./mako.nix ./user.nix + ./gtk.nix ]; options = { diff --git a/nix/modules/home/gtk.nix b/nix/modules/home/gtk.nix new file mode 100644 index 0000000..4e85b9d --- /dev/null +++ b/nix/modules/home/gtk.nix @@ -0,0 +1,8 @@ +{ lib, config, pkgs, ... }: +{ + gtk = { + theme = { + package = pkgs.catppuccin-gtk; + }; + }; +} diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix index dbe0b39..6561211 100644 --- a/nix/modules/home/hyprland.nix +++ b/nix/modules/home/hyprland.nix @@ -16,7 +16,7 @@ exec-once = [ "waybar" "swww-daemon --format xrgb" - "swww img ${wallpapers}/imagination.png" + "sh -c 'swww img \"$(find ${wallpapers} -type f \\( -iname \"*.jpg\" -o -iname \"*.png\" \\) | shuf -n1)\"'" "fcitx5-remote -r" "fcitx5 -d --replace" "fcitx5-remote -r" @@ -30,8 +30,8 @@ "__GLX_VENDOR_LIBRARY_NAME,nvidia" "ELECTRON_OZONE_PLATFORM_HINT,auto" ]; - blurls = [ - "waybar" + layerrule = [ + "blur,waybar" ]; monitor = [ "Unknown-1,disable" @@ -47,6 +47,7 @@ "workspace 3, title:^(.*fluffychat.*)$" "workspace 3, class:^(.*element-desktop.*)$" "workspace 4, class:^(.*qpwgraph.*)$" + "workspace 4, class:^(.*pavucontrol.*)$" "workspace 4, class:^(.*mpv.*)$" "workspace 5, title:^(.*Monero.*)$" "workspace 5, title:^(.*org\.bitcoin\..*)$" @@ -58,10 +59,10 @@ ]; bind = [ "$mod, F, exec, firefox" - "$mod, T, exec, tor-browser" "$mod, Return, exec, kitty" "$mod, E, exec, emacs" "$mod, B, exec, bitcoin-qt" + "$mod, S, exec, pavucontrol" "$mod, M, exec, monero-wallet-gui" "$mod, V, exec, vesktop" "$mod, C, exec, fluffychat" @@ -72,12 +73,18 @@ "$mod SHIFT, L, movewindow, r" "$mod SHIFT, K, movewindow, u" "$mod SHIFT, J, movewindow, d" + "$mod, T, togglefloating" "$mod, H, movefocus, l" "$mod, L, movefocus, r" "$mod, K, movefocus, u" "$mod, J, movefocus, d" ", XF86AudioPlay, exec, mpc toggle" ", Print, exec, grim" + + "$mod, right, resizeactive, 30 0" + "$mod, left, resizeactive, -30 0" + "$mod, up, resizeactive, 0 -30" + "$mod, down, resizeactive, 0 30" ] ++ ( builtins.concatLists (builtins.genList @@ -113,8 +120,14 @@ decoration = { blur = { enabled = true; - size = 5; - passes = 2; + size = 9; + passes = 4; + contrast = 0.8; + brightness = 1.1; + noise = 0.02; + new_optimizations = true; + ignore_opacity = true; + xray = false; }; rounding = 5; }; diff --git a/nix/modules/home/kitty.nix b/nix/modules/home/kitty.nix index b99736e..b3e6e33 100644 --- a/nix/modules/home/kitty.nix +++ b/nix/modules/home/kitty.nix @@ -7,7 +7,7 @@ font_family = "Iosevka Nerd Font"; font_size = 14; confirm_os_window_close = 0; - background_opacity = "0.9"; + background_opacity = "0.7"; # Catppuccin theme foreground = "#cdd6f4"; background = "#1e1e2e"; diff --git a/nix/systems/spontaneity/default.nix b/nix/systems/spontaneity/default.nix index 5f3dc36..6a3c316 100644 --- a/nix/systems/spontaneity/default.nix +++ b/nix/systems/spontaneity/default.nix @@ -23,6 +23,12 @@ in boot.loader.grub.device = "nodev"; networking = { + interfaces.ens3.ipv4.addresses = [ + { + address = ipv4addr; + prefixLength = 24; + } + ]; interfaces.ens3.ipv6.addresses = [ { address = ipv6addr; -- cgit v1.3