changes to ziggy

This commit is contained in:
2025-08-22 18:49:37 +02:00
parent babddc12d2
commit 819796424a
10 changed files with 55 additions and 71 deletions

48
flake.lock generated
View File

@@ -27,11 +27,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1755729720, "lastModified": 1755864602,
"narHash": "sha256-F6NKjTnVe5we9N7HAux1LEibshcTOndmm18TePGWQ68=", "narHash": "sha256-/r1llrce4yG7aoKwedeehNDRYJMdkTlbT55v+5bBHIQ=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "c674fe0e4130cec4f16e620c1fe30183cdb055f4", "rev": "0603f8242f054127eb49ed3f7d9eee5c1d4b5559",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -123,11 +123,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1755545956, "lastModified": 1755859279,
"narHash": "sha256-/dqfdlsu8jonCbwWTlYXC4vVU4/71Yvz/NZMu1NMwos=", "narHash": "sha256-yWx8vuyIlIDitOREOBs/ZjU67bl6oPc74AfV0QxvraQ=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "f14fadaa130cc0e222271acde3dddc3596b97c69", "rev": "a970ec75b7a3ca5192476330ff0d10c4c2fc029e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -483,11 +483,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755739851, "lastModified": 1755810213,
"narHash": "sha256-SC703bnPGOPWSEdZN2J2MkJWQBcUHV4QzuvFPdSVUME=", "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3c3510e61ca5c15a0f13d73c2232fa2d5478a86c", "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -525,11 +525,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755491080, "lastModified": 1755755322,
"narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", "rev": "282b4c98de97da6667cb03de4f427371734bc39c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -676,11 +676,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1755687691, "lastModified": 1755857635,
"narHash": "sha256-w/5JZD04Z4PoPjev0ZRRlrMSxvqDHYC2MZbliIo3z3Q=", "narHash": "sha256-64lx5RFb6e85yY5qGFUjj2aeu+MGjzVDlbkedokgOc4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "1ac1ff457ab8ef1ae6a8f2ab17ee7965adfa729f", "rev": "4e8875b5e9700c81ca4e169dc7b85bb5b3c8cb7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1064,11 +1064,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755151620, "lastModified": 1755670950,
"narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", "narHash": "sha256-x84lAqhbz752SU6zZY1yixm9Cbz6kdHtJs/5XE1LKGk=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "16e12d22754d97064867006acae6e16da7a142a6", "rev": "7caed3afea56de2b68b74d7a3b580d5b8ca8f445",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1276,11 +1276,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1755186698, "lastModified": 1755615617,
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1493,11 +1493,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755485198, "lastModified": 1755743804,
"narHash": "sha256-C3042ST2lUg0nh734gmuP4lRRIBitA6Maegg2/jYRM4=", "narHash": "sha256-M6qT02voARH5e9eTXQBzpYIE/hAp6jPgBCyxLmw5uBM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "aa45e63d431b28802ca4490cfc796b9e31731df7", "rev": "80322e975e27d834451d6b66e63f8abae9d74bf2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -120,7 +120,7 @@
enable = true; enable = true;
}; };
thunar = { thunar = {
enable = true; enable = false;
}; };
yubikey = { yubikey = {
enable = true; enable = true;

View File

@@ -37,6 +37,7 @@ in {
"radarr" "radarr"
"media" "media"
"share" "share"
"pihole"
]; ];
}; };
@@ -47,23 +48,12 @@ in {
./server.nix ./server.nix
]; ];
boot.initrd.luks.devices."luks-47b35d4b-467a-4637-a5f9-45177da62897".device = "/dev/disk/by-uuid/47b35d4b-467a-4637-a5f9-45177da62897";
networking = { networking = {
hostName = "ziggy"; hostName = "ziggy";
}; };
powerManagement.enable = false;
swapDevices = [
{
device = "/var/lib/swapfile";
size = 8 * 1024;
}
];
environment.variables.NH_FLAKE = "/home/cnst/.nix-config"; environment.variables.NH_FLAKE = "/home/cnst/.nix-config";
# # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = lib.mkDefault "25.05"; system.stateVersion = lib.mkDefault "25.11";
} }

View File

@@ -12,37 +12,17 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["usbhid"];
boot.initrd.kernelModules = ["amdgpu"]; boot.initrd.kernelModules = [];
boot.kernelModules = []; boot.kernelModules = [];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/a0a3595f-e61c-475c-8f4e-bfbb05582c20"; device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
fsType = "ext4"; 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" = { nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
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.<interface>.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;
} }

View File

@@ -29,7 +29,7 @@
network = { network = {
enable = true; enable = true;
interfaces = { interfaces = {
"enp6s0" = { "enu1u1" = {
allowedTCPPorts = [22 80 443 8090]; allowedTCPPorts = [22 80 443 8090];
allowedUDPPorts = [58846 6881]; allowedUDPPorts = [58846 6881];
}; };

View File

@@ -23,12 +23,20 @@
} }
}, },
"clock": { "clock": {
"format": "<span foreground='#928374'></span> {:%a, %d %b <span foreground='#928374'></span> %H:%M}", "interval": 60,
"on-click": "calcurse-toggle.sh", "format": "{:%H:%M}",
"on-click-right": "calsync.sh", // "on-click": "calcurse-toggle.sh",
// "on-click-right": "calsync.sh",
"rotate": 0, "rotate": 0,
"tooltip": false "tooltip": false
}, },
// "date": {
// "format": "<span foreground='#928374'></span> {%a, %d %b}",
// "on-click": "calcurse-toggle.sh",
// "on-click-right": "calsync.sh",
// "rotate": 0,
// "tooltip": false
// },
"cpu": { "cpu": {
"format": "<span foreground='#928374'></span> {usage}%", "format": "<span foreground='#928374'></span> {usage}%",
"states": { "states": {
@@ -139,6 +147,7 @@
"pulseaudio", "pulseaudio",
"backlight", "backlight",
"battery", "battery",
"date",
"clock", "clock",
"custom/dunst" "custom/dunst"
], ],

View File

@@ -2,9 +2,7 @@
all: unset; all: unset;
border: none; border: none;
border-radius: 0; border-radius: 0;
font-family: font-family: "Input Mono Narrow Light", "Font Awesome 6 Free Solid";
Input Mono Narrow Light,
"Font Awesome 6 Free Solid";
font-size: 14px; font-size: 14px;
min-height: 0; min-height: 0;
} }
@@ -89,11 +87,16 @@ window#waybar {
#memory, #memory,
#backlight, #backlight,
#battery, #battery,
#date,
#clock { #clock {
padding: 0 3px; padding: 0 3px;
margin: 0 3px; margin: 0 3px;
} }
#clock {
font-family: "DepartureMono Nerd Font";
}
#custom-dnd, #custom-dnd,
#custom-recording, #custom-recording,
#language { #language {

View File

@@ -22,7 +22,7 @@ in {
{ {
programs.hyprland.settings = { programs.hyprland.settings = {
# Common Keybind Variables # Common Keybind Variables
"$fileManager" = "thunar"; "$fileManager" = "nautilus";
"$yazi" = "foot -e yazi"; "$yazi" = "foot -e yazi";
"$launcher" = "fuzzel"; "$launcher" = "fuzzel";

View File

@@ -84,6 +84,7 @@ in {
networkmanagerapplet networkmanagerapplet
inotify-tools inotify-tools
wf-recorder wf-recorder
nautilus
]) ])
(mkIf cfg.desktop.enable [ (mkIf cfg.desktop.enable [

View File

@@ -31,8 +31,9 @@ in {
recursive recursive
input-fonts input-fonts
source-code-pro source-code-pro
nerd-fonts.jetbrains-mono
ibm-plex ibm-plex
nerd-fonts.jetbrains-mono
nerd-fonts.departure-mono
nerd-fonts.fira-code nerd-fonts.fira-code
nerd-fonts.fira-mono nerd-fonts.fira-mono
nerd-fonts.iosevka nerd-fonts.iosevka