From 27f0e0c797b9a65e181040de642cfdea8bd5db9d Mon Sep 17 00:00:00 2001 From: tulg Date: Fri, 24 Apr 2026 17:57:59 +0300 Subject: [PATCH] flake up --- config/hypr/hyprland.conf | 2 +- flake.lock | 155 +++++++++++----------- hosts/virgil/hardware-configuration.nix | 2 +- modules/home-manager/desktop/noctalia.nix | 4 - modules/nixos/common.nix | 3 + modules/nixos/services.nix | 12 ++ 6 files changed, 96 insertions(+), 82 deletions(-) diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index bbccb9d..a8857fc 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -32,7 +32,7 @@ exec-once = nm-applet --indicator exec-once = NetworkManager # Set monitor values. For own values, please comment with # #exec-once = .local/bin/mon.sh -exec-once = swww-daemon +exec-once = awww-daemon # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf diff --git a/flake.lock b/flake.lock index 8e3c5ff..79e4155 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1773025010, - "narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=", + "lastModified": 1776613567, + "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", "owner": "nix-community", "repo": "disko", - "rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3", + "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1775176642, + "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "179704030c5286c729b5b0522037d1d51341022c", "type": "github" }, "original": { @@ -146,11 +146,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -178,20 +178,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -201,11 +199,11 @@ ] }, "locked": { - "lastModified": 1773179137, - "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", + "lastModified": 1777004352, + "narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", + "rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f", "type": "github" }, "original": { @@ -222,11 +220,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -293,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -339,11 +337,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772773019, - "narHash": "sha256-nbKkTH2oRlWaAjeDh/QMraqjfj/C2xJFa53twFzRd8o=", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", + "lastModified": 1776169885, + "narHash": "sha256-Gk2T0tDDDAs319hp/ak+bAIUG5bPMvnNEjPV8CS86Fg=", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre958961.aca4d95fce49/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre980183.4bd9165a9165/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -358,11 +356,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773238064, - "narHash": "sha256-X0tFEb5WSldnU7f0S8vGp+Q0istOdRXmtPh8CoctCRc=", + "lastModified": 1776888984, + "narHash": "sha256-Up2F/eoMuPUsZnPVYdH5TMHe1TBP2Ue1QuWd0vWZoxY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "d35f399f535e31c53fd60409cae6a95214255dd9", + "rev": "2c1808f9f8937fc0b82c54af513f7620fec56d71", "type": "github" }, "original": { @@ -377,14 +375,15 @@ "noctalia", "nixpkgs" ], - "systems": "systems" + "systems": "systems", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773175685, - "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=", + "lastModified": 1776585574, + "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f", + "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", "type": "github" }, "original": { @@ -405,11 +404,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1775228139, + "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "type": "github" }, "original": { @@ -425,11 +424,11 @@ ] }, "locked": { - "lastModified": 1773129285, - "narHash": "sha256-7G6x33z271v/jhBC5Le7NPOZhv9902+MfCkC9poMwf0=", + "lastModified": 1777019459, + "narHash": "sha256-/JPmIuzUuNjxgYEnm56KqDIMpQbPN4hzTlOsMTMahok=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "bd6217927739a79c1c4ff279051f9625cd4b2b5e", + "rev": "e162429b6fa4443a0b45e19a867277dcc25d506b", "type": "github" }, "original": { @@ -458,11 +457,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1773161309, - "narHash": "sha256-k2Un0blYBeoN8mB5HO4rqCKISb427IWy0fzCdCUIcio=", + "lastModified": 1776894239, + "narHash": "sha256-Nse4cQgvcAcxTOevHGDvvQyJ9znCAkKFJxHEVEuHNOM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "61df7293cf732c7b66cce7f8b46f7017e721a6cd", + "rev": "de18e77f3c18dc568ca600ba8d72727b7829c798", "type": "github" }, "original": { @@ -485,18 +484,17 @@ ], "nur": "nur", "systems": "systems_3", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1772296853, - "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", + "lastModified": 1776893932, + "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", "owner": "nix-community", "repo": "stylix", - "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", + "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", "type": "github" }, "original": { @@ -550,23 +548,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -586,11 +567,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1772661346, + "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "13b5b0c299982bb361039601e2d72587d6846294", "type": "github" }, "original": { @@ -602,11 +583,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1772934010, + "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "type": "github" }, "original": { @@ -618,11 +599,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1772909925, + "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "type": "github" }, "original": { @@ -631,6 +612,28 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -639,11 +642,11 @@ ] }, "locked": { - "lastModified": 1773225617, - "narHash": "sha256-IT0n3jJgf4M7U0EuZJ2XJwXBmSJVVK3auqWDGeHGMzY=", + "lastModified": 1777008980, + "narHash": "sha256-pVZgqx3xbyFs0CnVlPLsizHL+S8vK1JcHQ1WVw/X+NI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "413a22ab7acf848ed4e20c3f47ea96ccd4788518", + "rev": "269ed2e95863c99ce067672813767661612e402b", "type": "github" }, "original": { diff --git a/hosts/virgil/hardware-configuration.nix b/hosts/virgil/hardware-configuration.nix index 8ed61e9..2511d96 100644 --- a/hosts/virgil/hardware-configuration.nix +++ b/hosts/virgil/hardware-configuration.nix @@ -53,7 +53,7 @@ # "nofail" # don’t block boot if missing # # "x-systemd.automount" # mount on first access # "noatime" - ]; + # ]; # }; fileSystems."/mnt/hdd1tb" = { diff --git a/modules/home-manager/desktop/noctalia.nix b/modules/home-manager/desktop/noctalia.nix index 5e2f80b..58ddef6 100644 --- a/modules/home-manager/desktop/noctalia.nix +++ b/modules/home-manager/desktop/noctalia.nix @@ -10,8 +10,6 @@ programs.noctalia-shell = { enable = true; settings = { - # configure noctalia here; defaults will - # be deep merged with these attributes. bar = { density = "compact"; position = "top"; @@ -57,7 +55,5 @@ enabled = false; }; }; - # this may also be a string or a path to a JSON file, - # but in this case must include *all* settings. }; } diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 7deac1a..30dac87 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -8,6 +8,9 @@ wireguard-tools iproute2 util-linux + qdirstat + moonlight-qt + amdgpu_top ]; nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = ["nix-command" "flakes"]; diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index f512edd..28c8458 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -7,6 +7,18 @@ services.ratbagd.enable = true; # logitech mouse config backend thingy systemd.services.tailscaled.after = ["network-online.target"]; systemd.services.tailscaled.wants = ["network-online.target"]; + services.avahi = { + enable = true; + nssmdns = true; + publish = { + enable = true; + addresses = true; + domain = true; + hinfo = true; + userServices = true; + workstation = true; + }; + }; services.tailscale = { enable = true; openFirewall = true;