From ea02714d7f81ba9d362e00908be3b0241cdb3315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Fri, 31 Jan 2025 10:37:03 +0100 Subject: [PATCH] update flake --- nix/configuration.nix | 11 +++++++++++ nix/flake.lock | 24 ++++++++++++------------ nix/hardware-configuration.nix | 11 +++++++++++ nix/packages.nix | 13 +++++++++++++ topgrade.toml | 1 - 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/nix/configuration.nix b/nix/configuration.nix index f7c7c4d..35413ba 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -24,12 +24,21 @@ LC_TELEPHONE = "es_ES.UTF-8"; LC_TIME = "es_ES.UTF-8"; }; + networking.firewall = rec { + allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; + allowedUDPPortRanges = allowedTCPPortRanges; + }; home-manager.users.catalin = { + programs.gnome-shell = { + enable = true; + extensions = [{ package = pkgs.gnomeExtensions.gsconnect; }]; + }; dconf = { enable = true; settings."org/gnome/shell" = { disable-user-extensions = false; enabled-extensions = with pkgs.gnomeExtensions; [ + gsconnect.extensionUuid user-themes.extensionUuid caffeine.extensionUuid colosseum.extensionUuid @@ -49,6 +58,7 @@ gnomeExtensions.dash-to-dock gnomeExtensions.clipboard-indicator gnomeExtensions.emoji-copy + gnomeExtensions.gsconnect gnome-tweaks catppuccin-gtk catppuccin-cursors @@ -144,5 +154,6 @@ nix.extraOptions = '' trusted-users = root catalin ''; + system.stateVersion = "24.11"; } diff --git a/nix/flake.lock b/nix/flake.lock index 65a9821..b571529 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -74,11 +74,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1735765328, - "narHash": "sha256-f4LI34cXP8nOTi4Va6GPUFaJYf0qGbabk+OeUddsfuk=", + "lastModified": 1738275804, + "narHash": "sha256-n9cSCLlWjc8Bc5QyZYLo5+c6MfTZjgDpUGx/FGxBiY8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "94599102e9fb8247af08cbbbcb7ee25e3d31e1bd", + "rev": "c5508e7d1922842ecd3160ea73b97da1282168b3", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "lastModified": 1738163270, + "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "unstable": { "locked": { - "lastModified": 1735617354, - "narHash": "sha256-5zJyv66q68QZJZsXtmjDBazGnF0id593VSy+8eSckoo=", + "lastModified": 1738136902, + "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "69b9a8c860bdbb977adfa9c5e817ccb717884182", + "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", "type": "github" }, "original": { diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix index df65371..4753dd2 100644 --- a/nix/hardware-configuration.nix +++ b/nix/hardware-configuration.nix @@ -42,6 +42,17 @@ options = [ "loop" ]; }; + fileSystems."/mnt/zeruel/nas1" = + { device = "zeruel.fuku:/mnt/pool1/nas1"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; + + fileSystems."/mnt/zeruel/dcsi" = + { device = "zeruel.fuku:/mnt/pool1/dcsi"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; swapDevices = [ { device = "/dev/disk/by-uuid/03ecd98d-013f-4476-b43a-bcae0bc1de67"; } ]; diff --git a/nix/packages.nix b/nix/packages.nix index 6d831da..07e2b77 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -74,4 +74,17 @@ pkgs: with pkgs; [ coder uv ventoy-full + chiaki-ng + gnome-themes-extra + tela-circle-icon-theme + docker-compose + neovim + obs-studio + ncdu + hmcl + rose-pine-gtk-theme + rose-pine-icon-theme + rose-pine-cursor + vlc + unrar-wrapper ] diff --git a/topgrade.toml b/topgrade.toml index fac03f3..b1afeb7 100644 --- a/topgrade.toml +++ b/topgrade.toml @@ -6,7 +6,6 @@ pre_sudo = true run_in_tmux = true display_time = true cleanup = true -pre_sudo = true no_self_update = true [firmware]