From dfc97d17ee79e94159c9500092503b9b14b8a0e6 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Wed, 12 Mar 2025 22:49:47 -0400 Subject: [PATCH] update desktop to unstable --- common/systemModules/kde.nix | 2 +- common/systemModules/stylix.nix | 8 +- common/users/homeModules/kde.nix | 7 +- common/users/homeModules/web.nix | 4 +- common/users/meyer/home.nix | 1 - customPackages/default.nix | 7 +- dotfiles/scripts | 2 +- flake.lock | 121 ++++++++++++++++++------------- flake.nix | 9 +-- 9 files changed, 89 insertions(+), 72 deletions(-) diff --git a/common/systemModules/kde.nix b/common/systemModules/kde.nix index 513c751..7a7b05b 100644 --- a/common/systemModules/kde.nix +++ b/common/systemModules/kde.nix @@ -2,7 +2,7 @@ { programs = { ssh = { - askPassword = "${pkgs.ksshaskpass}/bin/ksshaskpass"; + askPassword = "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass"; }; gnupg = { agent = { diff --git a/common/systemModules/stylix.nix b/common/systemModules/stylix.nix index 1927c34..95f21fa 100644 --- a/common/systemModules/stylix.nix +++ b/common/systemModules/stylix.nix @@ -41,10 +41,10 @@ base0F = "#F7768E"; }; fonts = { - emoji = { - package = pkgs.twemoji-color-font; - name = "Twitter Color Emoji"; - }; + # emoji = { + # package = pkgs.twemoji-color-font; + # name = "Twitter Color Emoji"; + # }; sansSerif = { package = stable.nerdfonts; name = "ComicShannsMono Nerd Font Mono"; diff --git a/common/users/homeModules/kde.nix b/common/users/homeModules/kde.nix index ab09396..1ee96f2 100644 --- a/common/users/homeModules/kde.nix +++ b/common/users/homeModules/kde.nix @@ -1,11 +1,10 @@ {pkgs, ...}: { home = { packages = with pkgs; [ - filelight - ksshaskpass + kdePackages.filelight + kdePackages.ksshaskpass xsel - libsForQt5.kinit - libsForQt5.kcolorchooser + kdePackages.kcolorchooser gnome-calculator ]; }; diff --git a/common/users/homeModules/web.nix b/common/users/homeModules/web.nix index a328b8b..2e642bf 100644 --- a/common/users/homeModules/web.nix +++ b/common/users/homeModules/web.nix @@ -1,11 +1,11 @@ -{ pkgs, ... }: +{ pkgs, stable, ... }: { imports = [ ./unstable.nix ]; home = { packages = with pkgs; [ - firefox-beta + pkgs.firefox-beta-bin vlc unstable.brave ]; diff --git a/common/users/meyer/home.nix b/common/users/meyer/home.nix index b6685f0..c17f846 100644 --- a/common/users/meyer/home.nix +++ b/common/users/meyer/home.nix @@ -39,7 +39,6 @@ ../homeModules/web.nix ../homeModules/zsh.nix ]; - # Home Manager needs a bit of information about you and the paths it should # nixpkg.config.allowUnfree = true; # manage. diff --git a/customPackages/default.nix b/customPackages/default.nix index 549fa06..062e8ad 100644 --- a/customPackages/default.nix +++ b/customPackages/default.nix @@ -1,4 +1,7 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: +let + system = pkgs.system; +in { nixpkgs = { overlays = [ @@ -10,7 +13,7 @@ frog = pkgs.callPackage ./frog { }; chrome-pak-customizer = inputs.chrome-pak.flakePackage pkgs; ceserver = inputs.ceserver.flakePackage pkgs; - scripts = inputs.scripts.flakePackage pkgs; + scripts = inputs.scripts.flakePackage system; }; }) ]; diff --git a/dotfiles/scripts b/dotfiles/scripts index 2e9ffe0..9cf2f8a 160000 --- a/dotfiles/scripts +++ b/dotfiles/scripts @@ -1 +1 @@ -Subproject commit 2e9ffe0933a170332bc490771a01dbbd75d06d71 +Subproject commit 9cf2f8a1619216f3cee62b6e1cfaeccd608ed619 diff --git a/flake.lock b/flake.lock index 1c16aa6..c325138 100644 --- a/flake.lock +++ b/flake.lock @@ -110,11 +110,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1739223196, - "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -273,11 +273,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1741122884, - "narHash": "sha256-OEsBtKs09fMyo4nlv/oRp3cXHnvTDq1HDhS0KbDC8N4=", + "lastModified": 1741791118, + "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", "owner": "nix-community", "repo": "home-manager", - "rev": "3f08cd8ef77dcd7586075a460a61c8432baf25a9", + "rev": "18780912345970e5b546b1b085385789b6935a83", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1740886574, - "narHash": "sha256-jN6kJ41B6jUVDTebIWeebTvrKP6YiLd1/wMej4uq4Sk=", + "lastModified": 1741619381, + "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "26a0f969549cf4d56f6e9046b9e0418b3f3b94a5", + "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab", "type": "github" }, "original": { @@ -458,11 +458,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740790927, - "narHash": "sha256-HfDgt1X8KjC4zFh4hBMkxIPAIsgFehaX8c+6OZ16kic=", + "lastModified": 1741826393, + "narHash": "sha256-deaIXY9Q5OpcSqWEaX5cB4pw0711q9+hRiiq6arqqoU=", "owner": "kaylorben", "repo": "nixcord", - "rev": "a1b3b4ccc9d48791ea63d1e94819077a1e379e2a", + "rev": "91abbf5736459beeacb1c3163a2236241cfc6c71", "type": "github" }, "original": { @@ -479,11 +479,11 @@ ] }, "locked": { - "lastModified": 1740567864, - "narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=", + "lastModified": 1741192150, + "narHash": "sha256-wB140alXVla1Rw/kENerUoma2qO1Jy5IYWbmiSqmJu0=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "1f40b43d01626ce994eb47150afa0d7215f396ca", + "rev": "0e4ccdb8181da2c6193c047b50ffee5f1a3b6dc1", "type": "github" }, "original": { @@ -510,23 +510,26 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1740872140, - "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -570,11 +573,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1740932899, - "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -585,6 +588,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -621,16 +640,14 @@ }, "scripts": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730600020, - "narHash": "sha256-QHjfVaL0ECvFXWOok4qPLxAD1itFaWm3TZ1MtjLLYgo=", + "lastModified": 1741833903, + "narHash": "sha256-tJua5LxKyEoFrX3Je4nwQL+mlBdpD22XmxkdZyOJBO8=", "owner": "sadan4", "repo": "scripts", - "rev": "2e9ffe0933a170332bc490771a01dbbd75d06d71", + "rev": "9cf2f8a1619216f3cee62b6e1cfaeccd608ed619", "type": "github" }, "original": { @@ -641,14 +658,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1741644481, + "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "e653d71e82575a43fe9d228def8eddb73887b866", "type": "github" }, "original": { @@ -665,11 +682,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1740889006, - "narHash": "sha256-A1iyKVvZrLdLwqWPC9OvPjC85ADQn2R1EGfCzJBl+wI=", + "lastModified": 1741493656, + "narHash": "sha256-1M2mf5pZTlhZXkSI8wKs9GfNb1hllND58zQUYSAe8EA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "f8d3757d4ae3af2175a631fb9598a42d30ee75fc", + "rev": "a06e502c884307c33dbdf2017fd50ab3592ad868", "type": "github" }, "original": { @@ -699,11 +716,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1740520580, - "narHash": "sha256-QRlcA8rtfNdyKpBE+ptjiB9717Tzum4/sKBSbsyqL6k=", + "lastModified": 1741703235, + "narHash": "sha256-3efck7239JPh6IHnqhETaoQejfxh4RBU16bE8IHOkto=", "owner": "danth", "repo": "stylix", - "rev": "aaa2eb8956770c096f9c46fb163bb26602e20e56", + "rev": "4a3ac9e30cd15b25a8b2e6cf0a7a047f454408bd", "type": "github" }, "original": { @@ -809,11 +826,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740272597, - "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cd1506a..b0b61e6 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,6 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; scripts = { - inputs.nixpkgs.follows = "nixpkgs"; url = "github:sadan4/scripts"; }; chrome-pak = { @@ -137,10 +136,10 @@ ) ]; }; - nix-desktop-evo4b5 = nixpkgs.lib.nixosSystem rec { + nix-desktop-evo4b5 = nixpkgs-unstable.lib.nixosSystem rec { specialArgs = { inherit inputs; - unstable = import nixpkgs-unstable { + stable = import nixpkgs { inherit system; config = { allowUnfree = true; @@ -153,12 +152,12 @@ { pkgs, ... }: { _module.args = { - stable = pkgs; + unstable = pkgs; }; } ) ./boxes/desktop/configuration.nix - inputs.home-manager.nixosModules.default + inputs.home-manager-unstable.nixosModules.default inputs.nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true; } ];