diff --git a/custom-pkgs/cargo-bisect-rustc/default.nix b/custom-pkgs/cargo-bisect-rustc/default.nix index 572bc8c..9bed6c7 100644 --- a/custom-pkgs/cargo-bisect-rustc/default.nix +++ b/custom-pkgs/cargo-bisect-rustc/default.nix @@ -9,7 +9,7 @@ pkgs: pkgs.rustPlatform.buildRustPackage { hash = "sha256-rr0fU1Y5k2ScT8zpBz4VhMaUlbW/ze00ORz8dUNFIpI="; }; - cargoHash = "sha256-4C63UsFlFAKaSXXwtO+u9yi3kvnLG8hKAnTQRKvwg2U="; + cargoHash = "sha256-9UijUaLcJwFxkkrd91K9r1vq2fNtsTQvc+ZWGaZQiNE="; patches = let diff --git a/custom-pkgs/crates/list.nix b/custom-pkgs/crates/list.nix index b2e9b27..40afd47 100644 --- a/custom-pkgs/crates/list.nix +++ b/custom-pkgs/crates/list.nix @@ -3,18 +3,18 @@ pkgs: [ pname = "cargo-dl"; version = "0.1.4"; downloadHash = "sha256-txSRmOr3tYw72xI5Dqt/y1EboaqFWEMN+lASVXLNdgQ="; - cargoHash = "sha256-bS1al2UnfUxCRjQYfvUKx19WW6sjGIwno78bORd3uBQ="; + cargoHash = "sha256-mkRZtC6JjsJxQ4DTjS2qw2y1opFIMt39eEMR1DurgAM="; } { pname = "counts"; version = "1.0.4"; downloadHash = "sha256-zLQHUHo3e/nY5UHhX03nK/gr+0rap/bSSlX7HDzr9uo="; - cargoHash = "sha256-pGrXn5/FD9RUbzt5DWM6LkEo0oHmosWy023Vd+EhcGY="; + cargoHash = "sha256-DVuIPO/dCk5rvPBzfM8lGGvM1ZZUUBgN7jSr/ZRGUwE="; } { pname = "typos-cli"; version = "1.19.0"; downloadHash = "sha256-qB0ISYBvblOGmoj1TUA9tddMHk9iDk0R3vlOWclQcMg="; - cargoHash = "sha256-ja4KrF2JdB2SVqnImdY7qdYXOJJgSftWtDCqWQ3ImYs="; + cargoHash = "sha256-s9L+VL37ivoEo5j6Z/JRApH/p4p5E+vl0i1HWWf4g5o="; } ] diff --git a/custom-pkgs/default.nix b/custom-pkgs/default.nix index 79e173a..7f269e6 100644 --- a/custom-pkgs/default.nix +++ b/custom-pkgs/default.nix @@ -3,7 +3,6 @@ pkgs: { monaspace = import ./monaspace.nix pkgs; run = import ./run { inherit pkgs; }; unpem = import ./unpem { inherit pkgs; }; - u = import ./u { inherit pkgs; }; x = import ./x { inherit pkgs; }; } diff --git a/custom-pkgs/u/default.nix b/custom-pkgs/u/default.nix deleted file mode 100644 index 12e6bf8..0000000 --- a/custom-pkgs/u/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pkgs, ... }: pkgs.writeShellApplication { - name = "u"; - - text = '' - programs=(cargo git) - - if [ -z "''${1:-}" ]; then - echo "u: universial command executor" - echo "programs: ''${programs[*]}" - exit 0 - fi - - program_to_use="" - - for program in "''${programs[@]}"; do - if PAGER=true "$program" "$1" --help >/dev/null 2>/dev/null; then - if [ -n "$program_to_use" ]; then - echo "u: conflict: $1 is provided by both $program_to_use and $program" >&2 - exit 1 - fi - program_to_use="$program" - fi - done - - if [ -n "$program_to_use" ]; then - exec "$program_to_use" "$@" - fi - - echo "error: cannot find program for $1" >&2 - exit 1 - ''; -} diff --git a/flake.lock b/flake.lock index a050a01..250b1cf 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1745033012, - "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", + "lastModified": 1740845322, + "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", + "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744991948, - "narHash": "sha256-f4xKjzY64l6e28YExcf/V8aLYzBzDdjNI7ZZJGBBz3Y=", + "lastModified": 1743370893, + "narHash": "sha256-u2PqVBoECxAsnY+1yy9DwWetuYyT7uw1FkSpGgh1mBI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a70acecb35de8941bac791c82d8e214d4be70567", + "rev": "22b0f8584e754448911fb50dd028af91ba9f579d", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1744878694, - "narHash": "sha256-e3jPdRQmlgeWwDTC/wnvKgIy4Ga8KZYoxUPQ8PCNktM=", + "lastModified": 1743260207, + "narHash": "sha256-AtizkeSqu7AeMe/JjN8CjENfTKgMGifDW0U2z+S0ygA=", "owner": "YaLTeR", "repo": "niri", - "rev": "7884d3bfea810740fe2ca7021b102af0f049ccae", + "rev": "b2c34e7fe94a12a65083ac73759672427ea2ccbf", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1743231893, + "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745055899, - "narHash": "sha256-nm8d8TN4lqnt9cy1EJtlsdwWntfBUmPcHPwyxSzveuM=", + "lastModified": 1740920439, + "narHash": "sha256-ckrCuBgQ12B0Vx/wuW4DXV1R2JvSRHzKQYR93FOQOQs=", "owner": "nix-community", "repo": "NUR", - "rev": "c34b27def51a14065218049d97b3256949d135f8", + "rev": "e79eda30591e5f9fb16aca4dd3669851c1ef8bc1", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1744860839, - "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", "type": "github" }, "original": { diff --git a/home-manager/common-packages.nix b/home-manager/common-packages.nix index a2f039b..bb01cfa 100644 --- a/home-manager/common-packages.nix +++ b/home-manager/common-packages.nix @@ -29,6 +29,5 @@ with pkgs; [ rustup-toolchain-install-master samply tokei - customPkgs.u uwuify ] ++ crates diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix index a714d0c..c0f2369 100644 --- a/home-manager/firefox.nix +++ b/home-manager/firefox.nix @@ -14,33 +14,30 @@ darkreader ]; - bookmarks = { - force = true; - settings = [ - { - name = "Nix sites"; - toolbar = true; - bookmarks = [ - { - name = "NixOS options"; - url = "https://search.nixos.org/options"; - } - { - name = "home-manager options"; - url = "https://rycee.gitlab.io/home-manager/options.html"; - } - { - name = "nixpkgs search"; - url = "https://search.nixos.org/packages"; - } - { - name = "Github Notifications"; - url = "https://github.com/notifications"; - } - ]; - } - ]; - }; + bookmarks = [ + { + name = "Nix sites"; + toolbar = true; + bookmarks = [ + { + name = "NixOS options"; + url = "https://search.nixos.org/options"; + } + { + name = "home-manager options"; + url = "https://rycee.gitlab.io/home-manager/options.html"; + } + { + name = "nixpkgs search"; + url = "https://search.nixos.org/packages"; + } + { + name = "Github Notifications"; + url = "https://github.com/notifications"; + } + ]; + } + ]; }; }; }; diff --git a/home-manager/git.nix b/home-manager/git.nix index 58592fe..902294a 100644 --- a/home-manager/git.nix +++ b/home-manager/git.nix @@ -20,8 +20,6 @@ autosq = "autosquash"; pfush = "!echo \"hör uf ume z'pfusche und machs richtig\""; sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})"; - # lol - build = "!cargo build"; }; difftastic = { enable = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 58f511f..ed5fad5 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -181,8 +181,10 @@ in xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gnome pkgs.gnome-keyring ]; programs.waybar.enable = true; - programs.coolercontrol.enable = true; - programs.coolercontrol.nvidiaSupport = true; + # TODO: Create a fancontrol config + hardware.fancontrol.enable = false; + hardware.fancontrol.config = '' + ''; services.flatpak.enable = true; console.keyMap = "sg";