From 0fd2177bd0968e8f26b910da026e1ea2f4bae302 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Sun, 30 Mar 2025 21:43:59 +0200 Subject: [PATCH] cleanup old file --- flake.lock | 110 ++++++++++++++------ flake.nix | 2 + lib/_root.nix | 20 ---- lib/windows.nix | 6 -- modules/home/desktop/terminal/alacritty.nix | 4 +- modules/home/shell/default.nix | 5 +- modules/home/shell/toolset/bat.nix | 22 ++++ modules/system/desktop/wine.nix | 8 ++ modules/system/shell/zsh.nix | 3 +- 9 files changed, 119 insertions(+), 61 deletions(-) delete mode 100644 lib/_root.nix delete mode 100644 lib/windows.nix create mode 100644 modules/home/shell/toolset/bat.nix create mode 100644 modules/system/desktop/wine.nix diff --git a/flake.lock b/flake.lock index 0f41bcf..c7704e1 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,25 @@ "type": "github" } }, + "erosanix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1742855878, + "narHash": "sha256-lT0cElpEcolGlNEjKhdiMwXTvzBzT2M0fWwbFt8HdDE=", + "owner": "emmanuelrosa", + "repo": "erosanix", + "rev": "6a9ad10694f6c8b1c028b7e5b7594d4bdcbbe845", + "type": "github" + }, + "original": { + "owner": "emmanuelrosa", + "repo": "erosanix", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -90,9 +109,9 @@ }, "firefox": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1743165243, @@ -125,6 +144,22 @@ } }, "flake-compat": { + "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-compat_2": { "locked": { "lastModified": 1717312683, "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", @@ -139,7 +174,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -155,7 +190,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -305,7 +340,7 @@ }, "flux": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1729388191, @@ -527,9 +562,9 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1743097263, @@ -562,16 +597,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743125403, - "narHash": "sha256-ax5yY7IA9XaO+qHiu2XNs7oivWlD4+YG+G8+VaAl8bE=", - "owner": "nixos", + "lastModified": 1741720763, + "narHash": "sha256-ZXvExBoZ1k0wVJDX+t8bBtKbfkrBwi2W2trbTB6M6XA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b25d37292b5b6a56a6a508d4632feceb52266333", + "rev": "6d526693e5be808bc788f353fe4013dd69277e2a", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", + "owner": "NixOS", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -608,27 +643,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1743125403, + "narHash": "sha256-ax5yY7IA9XaO+qHiu2XNs7oivWlD4+YG+G8+VaAl8bE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "b25d37292b5b6a56a6a508d4632feceb52266333", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -655,6 +690,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1742923925, "narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=", @@ -670,7 +721,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1742578646, "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", @@ -686,7 +737,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -702,7 +753,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -747,7 +798,7 @@ "flake-utils": "flake-utils_4", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "systems": "systems_5" }, "locked": { @@ -789,6 +840,7 @@ }, "root": { "inputs": { + "erosanix": "erosanix", "fenix": "fenix", "firefox": "firefox", "flux": "flux", @@ -796,7 +848,7 @@ "home-manager": "home-manager", "nix-minecraft": "nix-minecraft", "nixos-boot": "nixos-boot", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvf": "nvf", "plasma-manager": "plasma-manager", "sops-nix": "sops-nix", @@ -845,7 +897,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1742700801, @@ -868,12 +920,12 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_5", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nur": "nur", "systems": "systems_6", "tinted-foot": "tinted-foot", @@ -1092,7 +1144,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1727721329, diff --git a/flake.nix b/flake.nix index 80d16b1..a2c41bf 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,8 @@ url = "github:himmelblau-idm/himmelblau/main"; inputs.nixpkgs.follows = "nixpkgs"; }; + + erosanix.url = "github:emmanuelrosa/erosanix"; }; outputs = inputs @ { self, nixpkgs, nix-minecraft, flux, ... }: diff --git a/lib/_root.nix b/lib/_root.nix deleted file mode 100644 index 214e0eb..0000000 --- a/lib/_root.nix +++ /dev/null @@ -1,20 +0,0 @@ -args@{ inputs, lib, pkgs, config, options, ... }: let - inherit (lib.my) mapModulesRec'; -in -{ - imports = [] - ++(mapModulesRec' ../modules/home (file: (import file (args // { user = "root"; })))); - - config = { - modules.root = { - user = { - full_name = "__ROOT__"; - email = "__ROOT__@${config.networking.hostName}"; - }; - - shell = { - default = "zsh"; - }; - }; - }; -} diff --git a/lib/windows.nix b/lib/windows.nix deleted file mode 100644 index 45faace..0000000 --- a/lib/windows.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - mkWinApp = { }: { - - }; -} diff --git a/modules/home/desktop/terminal/alacritty.nix b/modules/home/desktop/terminal/alacritty.nix index cf441d8..858b1cc 100644 --- a/modules/home/desktop/terminal/alacritty.nix +++ b/modules/home/desktop/terminal/alacritty.nix @@ -39,9 +39,9 @@ in { save_to_clipboard = false; }; - live_config_reload = true; + general.live_config_reload = true; - shell = { + terminal.shell = { program = "${getExe pkgs.zsh}"; args = ["-l" "-c" "tmux new || tmux"]; }; diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index a062006..d386381 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -27,13 +27,14 @@ in (mkIf cfg.corePkgs.enable { modules.${user}.shell.toolset = { + bat.enable = true; btop.enable = true; + eza.enable = true; fzf.enable = true; + git.enable = true; starship.enable = true; tmux.enable = true; yazi.enable = true; - eza.enable = true; - git.enable = true; zoxide.enable = true; }; diff --git a/modules/home/shell/toolset/bat.nix b/modules/home/shell/toolset/bat.nix new file mode 100644 index 0000000..a1d2177 --- /dev/null +++ b/modules/home/shell/toolset/bat.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, user, ... }: +let + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; + + cfg = config.modules.${user}.shell.toolset.bat; +in +{ + options.modules.${user}.shell.toolset.bat = { + enable = mkEnableOption "cat replacement"; + }; + + config = mkIf cfg.enable { + home-manager.users.${user} = { + home.packages = with pkgs; [ bat ]; + + programs.bat = { + enable = true; + }; + }; + }; +} diff --git a/modules/system/desktop/wine.nix b/modules/system/desktop/wine.nix new file mode 100644 index 0000000..7444d77 --- /dev/null +++ b/modules/system/desktop/wine.nix @@ -0,0 +1,8 @@ +{ inputs, lib, pkgs, ... }: +{ + # imports = [ inputs.erosanix.nixosModules.someModule ]; + + config = { + + }; +} diff --git a/modules/system/shell/zsh.nix b/modules/system/shell/zsh.nix index 8884331..e765bc8 100644 --- a/modules/system/shell/zsh.nix +++ b/modules/system/shell/zsh.nix @@ -1,5 +1,4 @@ -{ config, lib, ... }: -let +{ config, lib, ... }: let inherit (lib.modules) mkIf; cfg = config.modules.shell.zsh;