From c96032611cfdf4916a0da2918a61415fe4e47666 Mon Sep 17 00:00:00 2001 From: rogueking Date: Sun, 7 Dec 2025 00:39:49 -0800 Subject: [PATCH] updated to 25.11 --- flake.lock | 133 ++++------------------ flake.nix | 4 +- home-manager/commands/git.nix | 31 ++--- home-manager/home.nix | 31 +++-- home-manager/programs/ghostty/ghostty.nix | 2 +- home-manager/programs/programs.nix | 11 +- home-manager/programs/rofi/rofi.nix | 6 +- hosts/buildbox/configuration.nix | 3 +- 8 files changed, 75 insertions(+), 146 deletions(-) diff --git a/flake.lock b/flake.lock index 0b70edf..bbf283b 100644 --- a/flake.lock +++ b/flake.lock @@ -53,24 +53,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -78,16 +60,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -99,11 +81,11 @@ ] }, "locked": { - "lastModified": 1763963090, - "narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -112,34 +94,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -147,11 +101,11 @@ ] }, "locked": { - "lastModified": 1763505477, - "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", + "lastModified": 1765065051, + "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", + "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", "type": "github" }, "original": { @@ -183,11 +137,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -229,11 +183,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -245,16 +199,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -265,15 +219,14 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1763946814, - "narHash": "sha256-BGM7b3b38cyAc7xdFgh+qbXGy5dEdZ+7bO3QX0QyzmM=", + "lastModified": 1765043977, + "narHash": "sha256-Gcdn1s/ynXRFNqInTcYltAi1gqgmTKw8Hw6OSfFNWMY=", "owner": "nix-community", "repo": "nixvim", - "rev": "3426dd04bbf7aacd2b51b8a40e62e29f4381e7a8", + "rev": "b65233d5f9736cf8d8fe9d4652e1faf610b574bc", "type": "github" }, "original": { @@ -282,29 +235,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", @@ -331,21 +261,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 31c1e4a..26a03be 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Nixos Config Flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nix-darwin.url = "github:nix-darwin/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -10,7 +10,7 @@ nix-snapd.inputs.pkgs-unstable.follows = "nixpkgs"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/commands/git.nix b/home-manager/commands/git.nix index 8778f2a..54bdec6 100644 --- a/home-manager/commands/git.nix +++ b/home-manager/commands/git.nix @@ -8,21 +8,13 @@ programs = { git = { enable = true; - userName = "rogueking"; - userEmail = "miguel@muniz.org"; lfs.enable = true; - } // lib.optionalAttrs (! (lib.elem hostname [ "buildbox" ])) { - signing = { - signByDefault = true; - signer = if hostname == "eva-02" - then - "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" - else - "/opt/1Password/op-ssh-sign"; - - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHI7zcxrwwg4VqpGduhPX31aslzXwkRXiM32+8K+aIMu"; - }; - extraConfig = { + settings = { + user = { + name = "rogueking"; + email = "miguel@muniz.org"; + }; + } // lib.optionalAttrs (! (lib.elem hostname [ "buildbox" ])) { gpg = { format = "ssh"; ssh = lib.optionalAttrs (hostname == "eva-02") { @@ -30,6 +22,17 @@ }; }; }; + } // lib.optionalAttrs (! (lib.elem hostname [ "buildbox" ])) { + signing = { + signByDefault = true; + signer = if hostname == "eva-02" + then + "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" + else + "/opt/1Password/op-ssh-sign"; + + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHI7zcxrwwg4VqpGduhPX31aslzXwkRXiM32+8K+aIMu"; + }; }; }; } diff --git a/home-manager/home.nix b/home-manager/home.nix index 02c271b..4a916a5 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,20 +1,27 @@ -{ config, pkgs, inputs, ... }: +{ + config, + pkgs, + inputs, + ... +}: { imports = [ - ./commands/commands.nix - ./programs/programs.nix - inputs.nixvim.homeModules.nixvim - ]; - + ./commands/commands.nix + ./programs/programs.nix + inputs.nixvim.homeModules.nixvim + ]; + # Home Manager needs a bit of information about you and the paths it should # manage. home.username = "rogueking"; # home.homeDirectory = "/Users/rogueking"; - home.homeDirectory = if pkgs.stdenv.isDarwin - then "/Users/rogueking" # Path for macOS - else "/home/rogueking"; # Path for Linux + home.homeDirectory = + if pkgs.stdenv.isDarwin then + "/Users/rogueking" # Path for macOS + else + "/home/rogueking"; # Path for Linux # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release @@ -27,10 +34,14 @@ nixpkgs.config.allowUnfree = true; + # Allow specific insecure packages + nixpkgs.config.permittedInsecurePackages = [ + #"python3.12-ecdsa-0.19.1" + ]; + # The home.packages option allows you to install Nix packages into your # environment. home.packages = with pkgs; [ - ]; diff --git a/home-manager/programs/ghostty/ghostty.nix b/home-manager/programs/ghostty/ghostty.nix index 7965c2c..1e19bc7 100644 --- a/home-manager/programs/ghostty/ghostty.nix +++ b/home-manager/programs/ghostty/ghostty.nix @@ -13,7 +13,7 @@ theme = "Adwaita Dark"; # Explicitly set color scheme preference to avoid GTK warnings - gtk-adwaita = true; + #gtk-adwaita = true; gtk-single-instance = true; diff --git a/home-manager/programs/programs.nix b/home-manager/programs/programs.nix index 276a1ef..ff65b93 100644 --- a/home-manager/programs/programs.nix +++ b/home-manager/programs/programs.nix @@ -21,13 +21,14 @@ brave desmume gparted - jellyfin-media-player +# jellyfin-media-player kdePackages.bluedevil kdePackages.bluez-qt kdePackages.kate kdePackages.kdeconnect-kde kdePackages.oxygen-sounds kdePackages.partitionmanager + kdePackages.isoimagewriter libreoffice-still librewolf localsend @@ -37,7 +38,6 @@ moonlight-qt nestopia-ue nix-ld - notion-app obsidian pandoc prismlauncher @@ -49,8 +49,6 @@ qFlipper r2modman remmina - sdrangel - sdrpp signal-desktop spice steam @@ -66,9 +64,10 @@ ] ++ lib.optionals (hostname == "eva-01") [ - sonic-visualiser - cinny-desktop calibre + sdrangel + sdrpp + sonic-visualiser ] ++ lib.optionals (hostname == "eva-02") [ diff --git a/home-manager/programs/rofi/rofi.nix b/home-manager/programs/rofi/rofi.nix index 88cda2c..325602a 100644 --- a/home-manager/programs/rofi/rofi.nix +++ b/home-manager/programs/rofi/rofi.nix @@ -9,12 +9,12 @@ programs.rofi = { enable = true; terminal = "ghostty"; - package = pkgs.rofi-wayland.override { - plugins = [ pkgs.rofi-emoji-wayland ]; + package = pkgs.rofi.override { + plugins = [ pkgs.rofi-emoji ]; }; font = "JetBrainsMono Nerd Font 12"; plugins = [ - pkgs.rofi-emoji-wayland + pkgs.rofi-emoji pkgs.rofi-calc pkgs.rofi-games pkgs.rofi-file-browser diff --git a/hosts/buildbox/configuration.nix b/hosts/buildbox/configuration.nix index 41aa004..c03a3c3 100644 --- a/hosts/buildbox/configuration.nix +++ b/hosts/buildbox/configuration.nix @@ -152,7 +152,8 @@ ]; nixpkgs.config.permittedInsecurePackages = [ - "python3.12-ecdsa-0.19.1" + "qtwebengine-5.15.19" + "python3.12-ecdsa-0.19.1" ]; # List packages installed in system profile. To search, run: