From 55682638d6f31ff96d0049e519bba44afe5bbede Mon Sep 17 00:00:00 2001 From: min Date: Sun, 6 Apr 2025 14:19:14 -0400 Subject: [PATCH] apr 2025 --- flake.lock | 87 ++++++++++++++++++++++++++++++++++--- flake.nix | 2 + homes/min/default.nix | 2 +- homes/min/games.nix | 11 +++-- homes/min/nh.nix | 5 --- homes/min/shell.nix | 8 ++-- homes/min/utils.nix | 26 +++++++++++ homes/min/waybar.nix | 6 +++ hosts/mpl/configuration.nix | 12 +++++ hosts/mpl/default.nix | 7 ++- hosts/mpl/mounts.nix | 4 ++ 11 files changed, 147 insertions(+), 23 deletions(-) delete mode 100644 homes/min/nh.nix create mode 100644 homes/min/utils.nix diff --git a/flake.lock b/flake.lock index a1ae7c3..06f78ca 100644 --- a/flake.lock +++ b/flake.lock @@ -105,6 +105,21 @@ "type": "github" } }, + "flake-compat_2": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -316,6 +331,47 @@ "type": "github" } }, + "nix-alien": { + "inputs": { + "flake-compat": "flake-compat_2", + "nix-index-database": "nix-index-database", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1739614676, + "narHash": "sha256-iDX6hXrO0J79hY3MqwU7t8b95j8DbqwdOug/Xdz4g6E=", + "owner": "thiagokokada", + "repo": "nix-alien", + "rev": "6255ffad7785bf04c7cff222f440de576c63363f", + "type": "github" + }, + "original": { + "owner": "thiagokokada", + "repo": "nix-alien", + "type": "github" + } + }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nix-alien", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739071773, + "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1734954597, @@ -333,16 +389,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734991663, - "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", - "owner": "nixos", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.11", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -391,6 +447,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734991663, + "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nuscht-search": { "inputs": { "flake-utils": "flake-utils", @@ -449,8 +521,9 @@ "home-manager": "home-manager_2", "impermanence": "impermanence", "lanzaboote": "lanzaboote", + "nix-alien": "nix-alien", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" } }, diff --git a/flake.nix b/flake.nix index 4095e74..06478da 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ catppuccin.url = "github:catppuccin/nix"; catppuccin.inputs.nixpkgs.follows = "nixpkgs"; + + nix-alien.url = "github:thiagokokada/nix-alien"; }; nixConfig = { diff --git a/homes/min/default.nix b/homes/min/default.nix index 8898a8d..3d4487f 100644 --- a/homes/min/default.nix +++ b/homes/min/default.nix @@ -9,10 +9,10 @@ ./hyprland.nix ./kdeconnect.nix ./mpris.nix - ./nh.nix ./shell.nix ./ssh.nix ./social.nix + ./utils.nix ]; home.stateVersion = "24.11"; diff --git a/homes/min/games.nix b/homes/min/games.nix index 218f086..3a454a5 100644 --- a/homes/min/games.nix +++ b/homes/min/games.nix @@ -1,5 +1,10 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - prismlauncher +{ + pkgs, + pkgs-unfree, + ... +}: { + home.packages = [ + pkgs.prismlauncher + pkgs-unfree.steam ]; } diff --git a/homes/min/nh.nix b/homes/min/nh.nix deleted file mode 100644 index 43a9bdb..0000000 --- a/homes/min/nh.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - programs.nh = { - enable = true; - }; -} diff --git a/homes/min/shell.nix b/homes/min/shell.nix index 317a2d8..2e64f7f 100644 --- a/homes/min/shell.nix +++ b/homes/min/shell.nix @@ -1,4 +1,4 @@ -{pkgs-unfree, ...}: { +{...}: { programs = let enableZsh = { enable = true; @@ -32,6 +32,8 @@ direnv = enableZsh; + yazi = enableZsh; + fzf = enableZsh; eza = enableZsh; zoxide = enableZsh; @@ -44,8 +46,4 @@ settings.color_theme = "ayu"; }; }; - - home.packages = with pkgs-unfree; [ - unrar - ]; } diff --git a/homes/min/utils.nix b/homes/min/utils.nix new file mode 100644 index 0000000..9859554 --- /dev/null +++ b/homes/min/utils.nix @@ -0,0 +1,26 @@ +{ + pkgs, + pkgs-unfree, + ... +}: { + programs.nh = { + enable = true; + }; + + home.packages = + (with pkgs; [ + # compression + unzip + p7zip + + # networking + mullvad + + # file sharing + qbittorrent + ]) + ++ (with pkgs-unfree; [ + # compression + unrar + ]); +} diff --git a/homes/min/waybar.nix b/homes/min/waybar.nix index dd5227e..a9c1466 100644 --- a/homes/min/waybar.nix +++ b/homes/min/waybar.nix @@ -105,6 +105,12 @@ _: { #workspaces button:hover { color: @pink; border-radius: 8px; + + box-shadow: none; + text-shadow: none; + background: none; + transition: none; + border-color: transparent; } #custom-music, diff --git a/hosts/mpl/configuration.nix b/hosts/mpl/configuration.nix index 24d28ac..058a694 100644 --- a/hosts/mpl/configuration.nix +++ b/hosts/mpl/configuration.nix @@ -78,6 +78,15 @@ }; services.pcscd.enable = true; + # nix-ld + programs.nix-ld.enable = true; + + # System packages + environment.systemPackages = with pkgs; + [ + ] + ++ [inputs.nix-alien.packages.${system}.nix-alien]; + # Enable TPM2 security.tpm2 = { enable = true; @@ -90,6 +99,9 @@ # KDE connect (firewall) programs.kdeconnect.enable = true; + # Mullvad service + services.mullvad-vpn.enable = true; + # Home-manager home-manager = { extraSpecialArgs = {inherit inputs pkgs-unfree;}; diff --git a/hosts/mpl/default.nix b/hosts/mpl/default.nix index 091c5b4..c4ea2d2 100644 --- a/hosts/mpl/default.nix +++ b/hosts/mpl/default.nix @@ -9,9 +9,12 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.catppuccin.nixosModules.catppuccin { - _module.args.pkgs-unfree = import inputs.nixpkgs { + _module.args = { + pkgs-unfree = import inputs.nixpkgs { + inherit system; + config.allowUnfree = true; + }; inherit system; - config.allowUnfree = true; }; } ./configuration.nix diff --git a/hosts/mpl/mounts.nix b/hosts/mpl/mounts.nix index 7c47827..e186f3f 100644 --- a/hosts/mpl/mounts.nix +++ b/hosts/mpl/mounts.nix @@ -30,13 +30,17 @@ ".local/share/zoxide" ".local/share/nix" # trusted settings ".local/state/wireplumber" # volumes, etc + ".config/kdeconnect" # games ".local/share/PrismLauncher" + ".local/share/Steam" + ".steam" # apps ".config/vesktop" ".librewolf" + ".idapro" # languages ".cargo"