From 93de9d3665a91aafa8d5447cd4b046e1c3ed6217 Mon Sep 17 00:00:00 2001 From: Thomas Syms Date: Tue, 22 Jul 2025 09:39:33 -0300 Subject: [PATCH] More Major Changes --- flake.lock | 197 +++++++----------- flake.nix | 12 +- .../common/optional/coding/vscode/default.nix | 9 +- hosts/common/optional/gdm.nix | 2 +- hosts/common/optional/gnome.nix | 2 +- hosts/common/optional/services/tailscale.nix | 5 + hosts/common/optional/thermal-management.nix | 2 +- hosts/nixos/Bellerophon/default.nix | 5 +- overlays/default.nix | 6 +- 9 files changed, 105 insertions(+), 135 deletions(-) create mode 100644 hosts/common/optional/services/tailscale.nix diff --git a/flake.lock b/flake.lock index 0792446..9c38894 100644 --- a/flake.lock +++ b/flake.lock @@ -105,14 +105,14 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751909516, - "narHash": "sha256-MMhscNXWOig2UzkWJkBoNGp0piO+0mln37HFGPkQV58=", + "lastModified": 1752595834, + "narHash": "sha256-vGUfuAmXbHo2Rl8iw3F2cQrmkbe51hl/ud6GEH9GSvc=", "owner": "cachix", "repo": "devenv", - "rev": "36e4cf7d6cb89862e69efce4e5c147ac2e4d38f9", + "rev": "b86afe223d628ac22f3d35e7b6bb9eb06b0e1023", "type": "github" }, "original": { @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1751854533, - "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", + "lastModified": 1752541678, + "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", "owner": "nix-community", "repo": "disko", - "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", + "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -261,10 +261,11 @@ ] }, "locked": { - "lastModified": 1749636823, + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -283,6 +284,7 @@ }, "locked": { "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", @@ -318,27 +320,27 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "48.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } }, "hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -354,15 +356,16 @@ ] }, "locked": { - "lastModified": 1751824240, - "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", + "lastModified": 1752544374, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", + "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -378,7 +381,10 @@ "devenv", "git-hooks" ], - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], "nixpkgs-23-11": [ "devenv" ], @@ -387,11 +393,11 @@ ] }, "locked": { - "lastModified": 1750955511, - "narHash": "sha256-IDB/oh/P63ZTdhgSkey2LZHzeNhCdoKk+4j7AaPe1SE=", + "lastModified": 1752251701, + "narHash": "sha256-fkkkwB7jz+14ZdIHAYCCNypO9EZDCKpj7LEQZhV6QJs=", "owner": "cachix", "repo": "nix", - "rev": "afa41b08df4f67b8d77a8034b037ac28c71c77df", + "rev": "54df04f09cb084b9e58529c0ae6f53f0e50f1a19", "type": "github" }, "original": { @@ -429,11 +435,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1751935943, - "narHash": "sha256-ORn5MaLrkUBEKWneV/R+3IafbC7G8UTfHDjXnM9RKqQ=", + "lastModified": 1752545719, + "narHash": "sha256-kHs5CC4EDx7iDew0gLvJYgMBtHfU81FH7VdL9IIrp30=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "8186db71ab2a9b73d73fa20fc32e5601f26ba593", + "rev": "1b61b3f647c3789df0e51c9e6adc4d99764272d1", "type": "github" }, "original": { @@ -444,11 +450,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -460,17 +466,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "lastModified": 1750441195, + "narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "0ceffe312871b443929ff3006960d29b120dc627", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", "type": "github" } }, @@ -508,11 +514,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -522,50 +528,18 @@ "type": "github" } }, - "nixpkgs-void-editor": { - "locked": { - "lastModified": 1746035195, - "narHash": "sha256-9eVYmsLuKY0Q9U5fB4bgZyjSJjjJYSUdh4A2BieLECc=", - "owner": "jskrzypek", - "repo": "nixpkgs", - "rev": "cc7e0513e30c8b08753a004bbb221202a01cb408", - "type": "github" - }, - "original": { - "owner": "jskrzypek", - "ref": "void-editor", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1746807397, - "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1752436162, + "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -579,15 +553,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1748730660, - "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", "owner": "nix-community", "repo": "NUR", - "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", "type": "github" }, "original": { @@ -627,11 +600,10 @@ "nix-darwin": "nix-darwin", "nix4vscode": "nix4vscode", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "nixpkgs-void-editor": "nixpkgs-void-editor", "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix", "zen-browser": "zen-browser" @@ -658,15 +630,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751914048, - "narHash": "sha256-xHO3xlw35tCC0f3pN3osPNjgwwwAgusTuZk5iC8oDiE=", + "lastModified": 1752531913, + "narHash": "sha256-5NCCOtkbNQEjXc7c+QO41p8etnIfCGQvmOC1SXBcNqQ=", "owner": "danth", "repo": "stylix", - "rev": "bf0ef81c8fcc30c32db9dab32d379f8d9db835e4", + "rev": "fd4572ba1673cc37a3cf96679bb3638d3d890a34", "type": "github" }, "original": { "owner": "danth", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -738,11 +711,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1748180480, - "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -754,11 +727,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1748740859, - "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -770,11 +743,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -783,28 +756,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": [ @@ -815,11 +766,11 @@ ] }, "locked": { - "lastModified": 1751930356, - "narHash": "sha256-xiG5vY4KhrIfUGb/MyPXaDiatFJ0mQngook01X4VwHg=", + "lastModified": 1752584655, + "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "06c1a125bfa2002e9d84ebf655271c6f06ab1f38", + "rev": "759a7860416dfd8c86f383d4ea4009bb034d869c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ed4124..9b29164 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,10 @@ # ========= Overlays ========= # # Custom modifications/overrides to upstream packages. - overlays = import ./overlays {inherit inputs;}; + overlays = import ./overlays { + inherit inputs; + inherit lib; + }; # # ========= Host Configurations ========= @@ -111,7 +114,7 @@ # # NOTE(starter): As with typical flake-based configs, you'll need to update the nixOS, hm, # and darwin version numbers below when new releases are available. - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # The next two inputs are for pinning nixpkgs to stable vs unstable regardless of what the above is set to. # This is particularly useful when an upcoming stable release is in beta because you can effectively # keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to @@ -119,11 +122,10 @@ # See also 'stable-packages' and 'unstable-packages' overlays at 'overlays/default.nix" nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-void-editor.url = "github:jskrzypek/nixpkgs/void-editor"; hardware.url = "github:nixos/nixos-hardware"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -158,7 +160,7 @@ devenv.url = "github:cachix/devenv"; stylix = { - url = "github:danth/stylix"; + url = "github:danth/stylix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/panotaka/common/optional/coding/vscode/default.nix b/home/panotaka/common/optional/coding/vscode/default.nix index da4b429..62e1886 100644 --- a/home/panotaka/common/optional/coding/vscode/default.nix +++ b/home/panotaka/common/optional/coding/vscode/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { imports = [ ./javascript.nix ./latex.nix @@ -7,6 +11,9 @@ ./rust.nix ]; + home.packages = with pkgs; [ + ]; + programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/hosts/common/optional/gdm.nix b/hosts/common/optional/gdm.nix index 9aef0c8..e1dbd57 100644 --- a/hosts/common/optional/gdm.nix +++ b/hosts/common/optional/gdm.nix @@ -1,6 +1,6 @@ # NOTE(starter): This is just a basic enabling of the XFCE windows manager for simplicity { - services.displayManager = { + services.xserver.displayManager = { gdm.enable = true; gdm.wayland = true; }; diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix index d99a23d..b9cc323 100644 --- a/hosts/common/optional/gnome.nix +++ b/hosts/common/optional/gnome.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - services.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.enable = true; #environment.sessionVariables.GTK_USE_PORTAL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/hosts/common/optional/services/tailscale.nix b/hosts/common/optional/services/tailscale.nix new file mode 100644 index 0000000..d0f6708 --- /dev/null +++ b/hosts/common/optional/services/tailscale.nix @@ -0,0 +1,5 @@ +{config, ...}: { + services.tailscale = { + enable = true; + }; +} diff --git a/hosts/common/optional/thermal-management.nix b/hosts/common/optional/thermal-management.nix index 338242f..6bd5cb8 100644 --- a/hosts/common/optional/thermal-management.nix +++ b/hosts/common/optional/thermal-management.nix @@ -1,5 +1,5 @@ { - services.thermald.enable = true; + services.thermald.enable = false; services.tlp = { enable = true; diff --git a/hosts/nixos/Bellerophon/default.nix b/hosts/nixos/Bellerophon/default.nix index df3efe8..2f6cc33 100644 --- a/hosts/nixos/Bellerophon/default.nix +++ b/hosts/nixos/Bellerophon/default.nix @@ -71,9 +71,10 @@ "hosts/common/optional/services/bluetooth.nix" "hosts/common/optional/services/ollama.nix" "hosts/common/optional/services/docker.nix" + "hosts/common/optional/services/tailscale.nix" "hosts/common/optional/audio.nix" # pipewire and cli controls - "hosts/common/optional/gnome.nix" - "hosts/common/optional/gdm.nix" + "hosts/common/optional/kde.nix" + "hosts/common/optional/sddm.nix" "hosts/common/optional/flatpak.nix" "hosts/common/optional/thermal-management.nix" diff --git a/overlays/default.nix b/overlays/default.nix index 8acb769..0d1e9e3 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,11 @@ # # This file defines overlays/custom modifications to upstream packages # -{inputs, ...}: let +{ + inputs, + lib, + ... +}: let # Adds my custom packages additions = final: prev: (prev.lib.packagesFromDirectoryRecursive { callPackage = prev.lib.callPackageWith final;