From 819796424a20378904401b5984cbae8c2bed2914 Mon Sep 17 00:00:00 2001 From: cnst Date: Fri, 22 Aug 2025 18:49:37 +0200 Subject: [PATCH] changes to ziggy --- flake.lock | 48 +++++++++---------- hosts/kima/modules.nix | 2 +- hosts/ziggy/default.nix | 14 +----- hosts/ziggy/hardware-configuration.nix | 30 ++---------- hosts/ziggy/modules.nix | 2 +- .../home/programs/waybar/config/config.jsonc | 15 ++++-- modules/home/programs/waybar/config/style.css | 9 ++-- modules/nixos/programs/hyprland/keybinds.nix | 2 +- modules/nixos/programs/pkgs/default.nix | 1 + modules/nixos/system/fonts/default.nix | 3 +- 10 files changed, 55 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 778a236a..299b095d 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755729720, - "narHash": "sha256-F6NKjTnVe5we9N7HAux1LEibshcTOndmm18TePGWQ68=", + "lastModified": 1755864602, + "narHash": "sha256-/r1llrce4yG7aoKwedeehNDRYJMdkTlbT55v+5bBHIQ=", "owner": "Aylur", "repo": "ags", - "rev": "c674fe0e4130cec4f16e620c1fe30183cdb055f4", + "rev": "0603f8242f054127eb49ed3f7d9eee5c1d4b5559", "type": "github" }, "original": { @@ -123,11 +123,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755545956, - "narHash": "sha256-/dqfdlsu8jonCbwWTlYXC4vVU4/71Yvz/NZMu1NMwos=", + "lastModified": 1755859279, + "narHash": "sha256-yWx8vuyIlIDitOREOBs/ZjU67bl6oPc74AfV0QxvraQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f14fadaa130cc0e222271acde3dddc3596b97c69", + "rev": "a970ec75b7a3ca5192476330ff0d10c4c2fc029e", "type": "github" }, "original": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1755739851, - "narHash": "sha256-SC703bnPGOPWSEdZN2J2MkJWQBcUHV4QzuvFPdSVUME=", + "lastModified": 1755810213, + "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c3510e61ca5c15a0f13d73c2232fa2d5478a86c", + "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", "type": "github" }, "original": { @@ -525,11 +525,11 @@ ] }, "locked": { - "lastModified": 1755491080, - "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", + "lastModified": 1755755322, + "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", + "rev": "282b4c98de97da6667cb03de4f427371734bc39c", "type": "github" }, "original": { @@ -676,11 +676,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1755687691, - "narHash": "sha256-w/5JZD04Z4PoPjev0ZRRlrMSxvqDHYC2MZbliIo3z3Q=", + "lastModified": 1755857635, + "narHash": "sha256-64lx5RFb6e85yY5qGFUjj2aeu+MGjzVDlbkedokgOc4=", "owner": "hyprwm", "repo": "hyprland", - "rev": "1ac1ff457ab8ef1ae6a8f2ab17ee7965adfa729f", + "rev": "4e8875b5e9700c81ca4e169dc7b85bb5b3c8cb7a", "type": "github" }, "original": { @@ -1064,11 +1064,11 @@ ] }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1755670950, + "narHash": "sha256-x84lAqhbz752SU6zZY1yixm9Cbz6kdHtJs/5XE1LKGk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "7caed3afea56de2b68b74d7a3b580d5b8ca8f445", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -1493,11 +1493,11 @@ ] }, "locked": { - "lastModified": 1755485198, - "narHash": "sha256-C3042ST2lUg0nh734gmuP4lRRIBitA6Maegg2/jYRM4=", + "lastModified": 1755743804, + "narHash": "sha256-M6qT02voARH5e9eTXQBzpYIE/hAp6jPgBCyxLmw5uBM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aa45e63d431b28802ca4490cfc796b9e31731df7", + "rev": "80322e975e27d834451d6b66e63f8abae9d74bf2", "type": "github" }, "original": { diff --git a/hosts/kima/modules.nix b/hosts/kima/modules.nix index f83cd0eb..b0a947f9 100644 --- a/hosts/kima/modules.nix +++ b/hosts/kima/modules.nix @@ -120,7 +120,7 @@ enable = true; }; thunar = { - enable = true; + enable = false; }; yubikey = { enable = true; diff --git a/hosts/ziggy/default.nix b/hosts/ziggy/default.nix index 87399363..af79ea24 100644 --- a/hosts/ziggy/default.nix +++ b/hosts/ziggy/default.nix @@ -37,6 +37,7 @@ in { "radarr" "media" "share" + "pihole" ]; }; @@ -47,23 +48,12 @@ in { ./server.nix ]; - boot.initrd.luks.devices."luks-47b35d4b-467a-4637-a5f9-45177da62897".device = "/dev/disk/by-uuid/47b35d4b-467a-4637-a5f9-45177da62897"; - networking = { hostName = "ziggy"; }; - powerManagement.enable = false; - - swapDevices = [ - { - device = "/var/lib/swapfile"; - size = 8 * 1024; - } - ]; - environment.variables.NH_FLAKE = "/home/cnst/.nix-config"; # # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = lib.mkDefault "25.05"; + system.stateVersion = lib.mkDefault "25.11"; } diff --git a/hosts/ziggy/hardware-configuration.nix b/hosts/ziggy/hardware-configuration.nix index be0b25df..028f9196 100644 --- a/hosts/ziggy/hardware-configuration.nix +++ b/hosts/ziggy/hardware-configuration.nix @@ -12,37 +12,17 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = ["amdgpu"]; + boot.initrd.availableKernelModules = ["usbhid"]; + boot.initrd.kernelModules = []; boot.kernelModules = []; boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/a0a3595f-e61c-475c-8f4e-bfbb05582c20"; + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-4f289fde-55ed-4b05-a6ee-d396db2a887b".device = "/dev/disk/by-uuid/4f289fde-55ed-4b05-a6ee-d396db2a887b"; + swapDevices = [{device = "/swapfile";}]; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/E03E-5458"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/704e09db-c7dd-462b-9560-47bbf845905d";} - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; } diff --git a/hosts/ziggy/modules.nix b/hosts/ziggy/modules.nix index a84182f7..804cafca 100644 --- a/hosts/ziggy/modules.nix +++ b/hosts/ziggy/modules.nix @@ -29,7 +29,7 @@ network = { enable = true; interfaces = { - "enp6s0" = { + "enu1u1" = { allowedTCPPorts = [22 80 443 8090]; allowedUDPPorts = [58846 6881]; }; diff --git a/modules/home/programs/waybar/config/config.jsonc b/modules/home/programs/waybar/config/config.jsonc index 3974c099..20603d59 100644 --- a/modules/home/programs/waybar/config/config.jsonc +++ b/modules/home/programs/waybar/config/config.jsonc @@ -23,12 +23,20 @@ } }, "clock": { - "format": " {:%a, %d %b %H:%M}", - "on-click": "calcurse-toggle.sh", - "on-click-right": "calsync.sh", + "interval": 60, + "format": "{:%H:%M}", + // "on-click": "calcurse-toggle.sh", + // "on-click-right": "calsync.sh", "rotate": 0, "tooltip": false }, + // "date": { + // "format": " {%a, %d %b}", + // "on-click": "calcurse-toggle.sh", + // "on-click-right": "calsync.sh", + // "rotate": 0, + // "tooltip": false + // }, "cpu": { "format": " {usage}%", "states": { @@ -139,6 +147,7 @@ "pulseaudio", "backlight", "battery", + "date", "clock", "custom/dunst" ], diff --git a/modules/home/programs/waybar/config/style.css b/modules/home/programs/waybar/config/style.css index ef90241f..b524b17d 100644 --- a/modules/home/programs/waybar/config/style.css +++ b/modules/home/programs/waybar/config/style.css @@ -2,9 +2,7 @@ all: unset; border: none; border-radius: 0; - font-family: - Input Mono Narrow Light, - "Font Awesome 6 Free Solid"; + font-family: "Input Mono Narrow Light", "Font Awesome 6 Free Solid"; font-size: 14px; min-height: 0; } @@ -89,11 +87,16 @@ window#waybar { #memory, #backlight, #battery, +#date, #clock { padding: 0 3px; margin: 0 3px; } +#clock { + font-family: "DepartureMono Nerd Font"; +} + #custom-dnd, #custom-recording, #language { diff --git a/modules/nixos/programs/hyprland/keybinds.nix b/modules/nixos/programs/hyprland/keybinds.nix index 3c4e8721..077e6fd1 100644 --- a/modules/nixos/programs/hyprland/keybinds.nix +++ b/modules/nixos/programs/hyprland/keybinds.nix @@ -22,7 +22,7 @@ in { { programs.hyprland.settings = { # Common Keybind Variables - "$fileManager" = "thunar"; + "$fileManager" = "nautilus"; "$yazi" = "foot -e yazi"; "$launcher" = "fuzzel"; diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index a129479f..75aff6f0 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -84,6 +84,7 @@ in { networkmanagerapplet inotify-tools wf-recorder + nautilus ]) (mkIf cfg.desktop.enable [ diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index d6361c68..b3dc6b0e 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -31,8 +31,9 @@ in { recursive input-fonts source-code-pro - nerd-fonts.jetbrains-mono ibm-plex + nerd-fonts.jetbrains-mono + nerd-fonts.departure-mono nerd-fonts.fira-code nerd-fonts.fira-mono nerd-fonts.iosevka