From 000b567383376eb627e8701676be9728fb195d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Sun, 17 Nov 2024 02:26:33 +0100 Subject: [PATCH] :sparkles: Added games, greeting, more up-to-date nixpkgs versions --- flake.lock | 42 ++++++++++---------- flake.nix | 7 +++- modules/home/cli/programs/krabby/default.nix | 20 ++++++++++ modules/home/cli/programs/tldr/default.nix | 20 ++++++++++ modules/home/cli/shells/fish/default.nix | 18 +++------ modules/home/games/vkquake/default.nix | 20 ++++++++++ modules/home/roles/development/default.nix | 2 + modules/home/roles/gaming/default.nix | 1 + modules/home/system/nix/default.nix | 2 +- overlays/base16-schemes/default.nix | 3 -- 10 files changed, 96 insertions(+), 39 deletions(-) create mode 100644 modules/home/cli/programs/krabby/default.nix create mode 100644 modules/home/cli/programs/tldr/default.nix create mode 100644 modules/home/games/vkquake/default.nix delete mode 100644 overlays/base16-schemes/default.nix diff --git a/flake.lock b/flake.lock index 11a7b86..e47fcec 100644 --- a/flake.lock +++ b/flake.lock @@ -609,22 +609,6 @@ "type": "github" } }, - "nixpkgs-85f7e66": { - "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -706,15 +690,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1731796084, - "narHash": "sha256-CwFQc/xErQmVyP51xfYGh2gpMgS0Pcme7oBCk0+5khU=", + "lastModified": 1731792568, + "narHash": "sha256-ukXN8HNUVs4/S/eLAmkMDWdUH4Qt6VkwPIiYGd9KJTI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d903a3ee64fb1d188695098694797869ab3a7551", + "rev": "ee202b2125eb6cfd953509fc7bb336a7658de960", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-24.11-small", "repo": "nixpkgs", "type": "github" } @@ -847,13 +832,13 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", - "nixpkgs-85f7e66": "nixpkgs-85f7e66", "nur": "nur", "plasma-manager": "plasma-manager", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", - "stylix": "stylix" + "stylix": "stylix", + "unstable": "unstable" } }, "snowfall-lib": { @@ -1079,6 +1064,21 @@ "repo": "treefmt-nix", "type": "github" } + }, + "unstable": { + "locked": { + "lastModified": 1731845826, + "narHash": "sha256-qreZKOC+z7CtmLyPbINzNxA4FjewzE1MpaYZR4XzA5I=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "99df2ed6bb88cbd9e6b405fbe8fbf8be90030c7c", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2c22773..5eef227 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,11 @@ description = "theobori's Nix/NixOS Config"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs"; - nixpkgs-85f7e66.url = "github:nixos/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11-small"; + + # We assume this version of nixpkgs is more updated than the `nixpkgs` input. + # Will be used within overlay to get the latest version of specific packages. + unstable.url = "github:nixos/nixpkgs"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/home/cli/programs/krabby/default.nix b/modules/home/cli/programs/krabby/default.nix new file mode 100644 index 0000000..e71929d --- /dev/null +++ b/modules/home/cli/programs/krabby/default.nix @@ -0,0 +1,20 @@ +{ + pkgs, + config, + lib, + namespace, + ... +}: +let + inherit (lib) mkIf; + inherit (lib.${namespace}) mkBoolOpt; + + cfg = config.${namespace}.cli.programs.krabby; +in +{ + options.${namespace}.cli.programs.krabby = { + enable = mkBoolOpt false "Whether or not to enable krabby."; + }; + + config = mkIf cfg.enable { home.packages = with pkgs; [ krabby ]; }; +} diff --git a/modules/home/cli/programs/tldr/default.nix b/modules/home/cli/programs/tldr/default.nix new file mode 100644 index 0000000..ce4dadb --- /dev/null +++ b/modules/home/cli/programs/tldr/default.nix @@ -0,0 +1,20 @@ +{ + pkgs, + config, + lib, + namespace, + ... +}: +let + inherit (lib) mkIf; + inherit (lib.${namespace}) mkBoolOpt; + + cfg = config.${namespace}.cli.programs.tldr; +in +{ + options.${namespace}.cli.programs.tldr = { + enable = mkBoolOpt false "Whether or not to enable tldr."; + }; + + config = mkIf cfg.enable { home.packages = with pkgs; [ tldr ]; }; +} diff --git a/modules/home/cli/shells/fish/default.nix b/modules/home/cli/shells/fish/default.nix index 124f0f4..285ffdb 100644 --- a/modules/home/cli/shells/fish/default.nix +++ b/modules/home/cli/shells/fish/default.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib) mkIf getExe; inherit (lib.${namespace}) mkBoolOpt; cfg = config.${namespace}.cli.shells.fish; @@ -21,7 +21,7 @@ in enable = true; interactiveShellInit = '' # There are fish intregration from home-manager module - ${pkgs.nix-your-shell}/bin/nix-your-shell --nom fish | source + ${getExe pkgs.nix-your-shell} --nom fish | source set -gx GOPATH $XDG_DATA_HOME/go set -gx PATH /usr/local/bin /usr/bin ~/.local/bin $GOPATH/bin/ $PATH $HOME/.cargo/bin @@ -42,18 +42,12 @@ in cdi = "zi"; curl = "curlie"; tree = "eza --tree"; - - # nix - nhh = "nh home switch"; - nho = "nh os switch"; - nhu = "nh os --update"; - - nd = "nix develop"; - nfu = "nix flake update"; }; functions = { - fish_greeting = ''''; + fish_greeting = '' + ${getExe pkgs.krabby} name gengar --no-title + ''; hmg = '' set current_gen (home-manager generations | head -n 1 | awk '{print $7}') @@ -64,7 +58,7 @@ in # If you run the command with comma, running the same command # will not prompt for confirmation for the rest of the session if contains $argv[1] $__command_not_found_confirmed_commands - or ${pkgs.gum}/bin/gum confirm --selected.background=2 "Run using comma?" + or ${getExe pkgs.gum} confirm --selected.background=2 "Run using comma?" # Not bothering with capturing the status of the command, just run it again if not contains $argv[1] $__command_not_found_confirmed_commands diff --git a/modules/home/games/vkquake/default.nix b/modules/home/games/vkquake/default.nix new file mode 100644 index 0000000..776a88e --- /dev/null +++ b/modules/home/games/vkquake/default.nix @@ -0,0 +1,20 @@ +{ + pkgs, + config, + lib, + namespace, + ... +}: +let + inherit (lib) mkIf; + inherit (lib.${namespace}) mkBoolOpt; + + cfg = config.${namespace}.games.vkquake; +in +{ + options.${namespace}.games.vkquake = { + enable = mkBoolOpt false "Enable vkquake."; + }; + + config = mkIf cfg.enable { home.packages = with pkgs; [ vkquake ]; }; +} diff --git a/modules/home/roles/development/default.nix b/modules/home/roles/development/default.nix index ddd719f..5e5b78f 100644 --- a/modules/home/roles/development/default.nix +++ b/modules/home/roles/development/default.nix @@ -48,6 +48,8 @@ in zoxide = enabled; thefuck = enabled; lazygit = enabled; + tldr = enabled; + krabby = enabled; }; }; }; diff --git a/modules/home/roles/gaming/default.nix b/modules/home/roles/gaming/default.nix index 2cbe168..cc6b065 100644 --- a/modules/home/roles/gaming/default.nix +++ b/modules/home/roles/gaming/default.nix @@ -21,6 +21,7 @@ in teeworlds = enabled; taterclient-ddnet = enabled; supermariowar = enabled; + vkquake = enabled; }; }; }; diff --git a/modules/home/system/nix/default.nix b/modules/home/system/nix/default.nix index 8150728..747af51 100644 --- a/modules/home/system/nix/default.nix +++ b/modules/home/system/nix/default.nix @@ -36,7 +36,7 @@ in nix = { settings = { - trusted-substituters = [ + substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" "https://numtide.cachix.org?priority=42" diff --git a/overlays/base16-schemes/default.nix b/overlays/base16-schemes/default.nix deleted file mode 100644 index 5a7967d..0000000 --- a/overlays/base16-schemes/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ channels, ... }: - -_final: _prev: { inherit (channels.nixpkgs-85f7e66) base16-schemes; }