From d7179ea15b3a8f05e3a475c264d3473c292fd76d Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:50:08 -0500 Subject: [PATCH] update to 24.11 and use stable --- .gitmodules | 3 - .../users/homeModules/dev/ide/reverseEng.nix | 1 + common/users/homeModules/dev/python.nix | 4 +- common/users/homeModules/zsh.nix | 1 + customPackages/chrome-pak-customizer | 1 - customPackages/default.nix | 2 +- flake.lock | 393 ++++-------------- flake.nix | 44 +- 8 files changed, 115 insertions(+), 334 deletions(-) delete mode 160000 customPackages/chrome-pak-customizer diff --git a/.gitmodules b/.gitmodules index dab44df..c685a79 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "dotfiles/scripts"] path = dotfiles/scripts url = git@github.com:sadan4/scripts.git -[submodule "customPackages/chrome-pak-customizer"] - path = customPackages/chrome-pak-customizer - url = git@github.com:sadan4/chrome-pak-customizer diff --git a/common/users/homeModules/dev/ide/reverseEng.nix b/common/users/homeModules/dev/ide/reverseEng.nix index c2a8ab9..ce8b314 100644 --- a/common/users/homeModules/dev/ide/reverseEng.nix +++ b/common/users/homeModules/dev/ide/reverseEng.nix @@ -3,6 +3,7 @@ packages = with pkgs; [ ghidra ida-free + cutter ]; }; } diff --git a/common/users/homeModules/dev/python.nix b/common/users/homeModules/dev/python.nix index fb6d754..4530c00 100644 --- a/common/users/homeModules/dev/python.nix +++ b/common/users/homeModules/dev/python.nix @@ -11,9 +11,11 @@ loguru evdev setuptools + protobuf + psutil ] )) python312Packages.openai-whisper ]; }; -} \ No newline at end of file +} diff --git a/common/users/homeModules/zsh.nix b/common/users/homeModules/zsh.nix index 0a0792e..8aa09ec 100644 --- a/common/users/homeModules/zsh.nix +++ b/common/users/homeModules/zsh.nix @@ -15,6 +15,7 @@ in { home = { packages = with pkgs; [ + powershell zsh-powerlevel10k zsh-syntax-highlighting ]; diff --git a/customPackages/chrome-pak-customizer b/customPackages/chrome-pak-customizer deleted file mode 160000 index 34d2df7..0000000 --- a/customPackages/chrome-pak-customizer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34d2df78fd82b84bfd8affef6776afd57611d4f4 diff --git a/customPackages/default.nix b/customPackages/default.nix index f18b312..549fa06 100644 --- a/customPackages/default.nix +++ b/customPackages/default.nix @@ -8,7 +8,7 @@ # vesktop = pkgs.callPackage ./vesktop/default.nix { inherit vencord; }; # vencord = pkgs.callPackage ./vencord/package.nix { }; frog = pkgs.callPackage ./frog { }; - chrome-pak-customizer = pkgs.callPackage inputs.chrome-pak { }; + chrome-pak-customizer = inputs.chrome-pak.flakePackage pkgs; ceserver = inputs.ceserver.flakePackage pkgs; scripts = inputs.scripts.flakePackage pkgs; }; diff --git a/flake.lock b/flake.lock index ab7221e..e95f65e 100644 --- a/flake.lock +++ b/flake.lock @@ -34,38 +34,6 @@ "type": "github" } }, - "base16-fish_2": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { @@ -82,54 +50,6 @@ "type": "github" } }, - "base16-helix_2": { - "flake": false, - "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -146,40 +66,6 @@ "type": "github" } }, - "base16-vim_2": { - "flake": false, - "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", - "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", - "type": "github" - }, - "original": { - "owner": "chriskempson", - "repo": "base16-vim", - "type": "github" - } - }, - "base16_2": { - "inputs": { - "fromYaml": "fromYaml_2" - }, - "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, "ceserver": { "inputs": { "flake-utils": "flake-utils", @@ -203,19 +89,21 @@ } }, "chrome-pak": { - "flake": false, + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1734393492, - "narHash": "sha256-xbLtaBd3/uR8GYVhg9a+vZ3CLgNayHjlKWBZkcUIkS8=", - "ref": "refs/heads/develop", - "rev": "34d2df78fd82b84bfd8affef6776afd57611d4f4", - "revCount": 33, - "type": "git", - "url": "file:./customPackages/chrome-pak-customizer" + "lastModified": 1736899696, + "narHash": "sha256-ltAU+oQikCK9shx2diN2YwtnvlR48PLxCK8D426fAvY=", + "owner": "sadan4", + "repo": "chrome-pak-customizer", + "rev": "226c82b8e9f90cb8fd3e7551bf4453861b8a4f6e", + "type": "github" }, "original": { - "type": "git", - "url": "file:./customPackages/chrome-pak-customizer" + "owner": "sadan4", + "repo": "chrome-pak-customizer", + "type": "github" } }, "firefox-gnome-theme": { @@ -281,22 +169,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -391,22 +263,6 @@ "type": "github" } }, - "fromYaml_2": { - "flake": false, - "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -477,29 +333,33 @@ "type": "github" } }, - "gnome-shell_2": { - "flake": false, - "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "46.1", - "repo": "gnome-shell", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, + "locked": { + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, "locked": { "lastModified": 1736785676, "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", @@ -514,27 +374,6 @@ "type": "github" } }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "nix-stable" - ] - }, - "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -543,36 +382,16 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "stylix-stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -583,7 +402,7 @@ "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1734239219, @@ -654,27 +473,11 @@ "type": "github" } }, - "nix-stable": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", "nixpkgs": [ - "nix-stable" + "nixpkgs" ] }, "locked": { @@ -693,16 +496,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", - "owner": "NixOS", + "lastModified": 1736867362, + "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -719,7 +522,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, - "nixpkgs_2": { + "nixpkgs-unstable": { "locked": { "lastModified": 1736798957, "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", @@ -735,7 +538,39 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { + "locked": { + "lastModified": 1736867362, + "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -751,7 +586,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -773,21 +608,20 @@ "chrome-pak": "chrome-pak", "flake-parts": "flake-parts", "home-manager": "home-manager", - "home-manager-stable": "home-manager-stable", + "home-manager-unstable": "home-manager-unstable", "nix-alien": "nix-alien", "nix-index-database": "nix-index-database_2", - "nix-stable": "nix-stable", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable", "scripts": "scripts", "sops-nix": "sops-nix", - "stylix": "stylix", - "stylix-stable": "stylix-stable" + "stylix": "stylix" } }, "scripts": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1730600020, @@ -805,7 +639,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1736808430, @@ -839,50 +673,19 @@ "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1736882096, - "narHash": "sha256-TQFkQ6RN8L/Xto5Ttt6hwJInFI5Nz2uCfXg5ci2q6UA=", + "lastModified": 1736381946, + "narHash": "sha256-k66y4eMHZiJO3N43wuZOdoRmGmNwIj3EZq6NGK+AEM8=", "owner": "danth", "repo": "stylix", - "rev": "965d1cb7c84170200b4f05e68ebd27a88d171e8c", + "rev": "c62df1918d178ade64dc8a2df99e78a5d5f20514", "type": "github" }, "original": { "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, - "stylix-stable": { - "inputs": { - "base16": "base16_2", - "base16-fish": "base16-fish_2", - "base16-foot": "base16-foot", - "base16-helix": "base16-helix_2", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", - "base16-vim": "base16-vim_2", - "flake-compat": "flake-compat_4", - "gnome-shell": "gnome-shell_2", - "home-manager": "home-manager_3", - "nixpkgs": [ - "nix-stable" - ] - }, - "locked": { - "lastModified": 1718122552, - "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", - "owner": "danth", - "repo": "stylix", - "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", - "type": "github" - }, - "original": { - "owner": "danth", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "stylix", "type": "github" } @@ -981,22 +784,6 @@ "repo": "tinted-tmux", "type": "github" } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 04ef9da..e19f76a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,40 +2,35 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; sops-nix = { url = "github:Mic92/sops-nix"; }; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - nix-stable.url = "github:nixos/nixpkgs/nixos-24.05"; nixos-wsl = { url = "github:nix-community/nixos-wsl"; - inputs.nixpkgs.follows = "nix-stable"; + inputs.nixpkgs.follows = "nixpkgs"; }; - stylix-stable = { - url = "github:danth/stylix/release-24.05"; - inputs.nixpkgs.follows = "nix-stable"; - }; - home-manager-stable = { - url = "github:nix-community/home-manager/release-24.05"; - inputs.nixpkgs.follows = "nix-stable"; + stylix = { + url = "github:danth/stylix/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager-unstable = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; scripts = { inputs.scripts.follows = "nixpkgs"; url = "github:sadan4/scripts"; }; - stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; chrome-pak = { - url = "git+file:./customPackages/chrome-pak-customizer"; - flake = false; + url = "github:sadan4/chrome-pak-customizer"; }; ceserver = { url = "github:sadan4/ceserver"; @@ -47,9 +42,9 @@ outputs = { self, - nixpkgs, nixos-wsl, - nix-stable, + nixpkgs, + nixpkgs-unstable, flake-parts, ... }@inputs: @@ -113,7 +108,7 @@ nix-desktop-evo4b5 = nixpkgs.lib.nixosSystem rec { specialArgs = { inherit inputs; - stable = import nix-stable { + unstable = import nixpkgs-unstable { inherit system; config = { allowUnfree = true; @@ -126,7 +121,7 @@ { pkgs, ... }: { _module.args = { - unstable = pkgs; + stable = pkgs; }; } ) @@ -136,15 +131,14 @@ { programs.nix-index-database.comma.enable = true; } ]; }; - arm-laptop-evo4b5 = nix-stable.lib.nixosSystem rec { + arm-laptop-evo4b5 = nixpkgs.lib.nixosSystem rec { system = "aarch64-linux"; specialArgs = { inputs = inputs // { - nixpkgs = nix-stable; + nixpkgs = nixpkgs; home-manager = inputs.home-manager-stable; - stylix = inputs.stylix-stable; }; - unstable = import nixpkgs { + unstable = import nixpkgs-unstable { inherit system; config = { allowUnfree = true;