From 84b12dca7f15cb0c4f5eafb62fadca1dad06f92e Mon Sep 17 00:00:00 2001 From: tulg Date: Sat, 28 Feb 2026 18:16:24 +0300 Subject: [PATCH] testing 67 --- flake.nix | 1 + modules/home-manager/cli/clipkgs.nix | 20 ++++++++++++++++++++ modules/home-manager/cli/default.nix | 5 +++++ modules/home-manager/desktop/default.nix | 5 +++++ modules/home-manager/{ => desktop}/pkgs.nix | 17 +++++++---------- modules/home-manager/desktop/vscode.nix | 1 + modules/home-manager/home.nix | 5 +++-- 7 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 modules/home-manager/cli/clipkgs.nix rename modules/home-manager/{ => desktop}/pkgs.nix (65%) diff --git a/flake.nix b/flake.nix index dacbdf3..3022e47 100644 --- a/flake.nix +++ b/flake.nix @@ -119,6 +119,7 @@ users.tulg = { imports = [./modules/home-manager/home.nix]; + tulg.desktop.enable = true; }; }; } diff --git a/modules/home-manager/cli/clipkgs.nix b/modules/home-manager/cli/clipkgs.nix new file mode 100644 index 0000000..ca9a160 --- /dev/null +++ b/modules/home-manager/cli/clipkgs.nix @@ -0,0 +1,20 @@ +{ + pkgs, + inputs, + ... +}: { + home.packages = with pkgs; [ + rose-pine-gtk-theme + alejandra + vulkan-tools + pkgs.looking-glass-client + tmux + restic + fastfetch + btop + wl-clipboard + pkgs.nixd + inxi + kitty + ]; +} diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix index 109623f..d47a7ee 100644 --- a/modules/home-manager/cli/default.nix +++ b/modules/home-manager/cli/default.nix @@ -1,6 +1,11 @@ {lib, ...}: { + options = { + tulg.shell.enable = lib.mkEnableOption "shellshit"; + }; + imports = [ ./yazi.nix ./shell.nix + ./clipkgs.nix ]; } diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix index 5c616f2..c1a4d86 100644 --- a/modules/home-manager/desktop/default.nix +++ b/modules/home-manager/desktop/default.nix @@ -1,4 +1,8 @@ {lib, ...}: { + options = { + tulg.desktop.enable = lib.mkEnableOption "gui"; + }; + imports = [ ./noctalia.nix ./symlink.nix @@ -6,5 +10,6 @@ ./spicetify.nix ./browsers/zen.nix ./vscode.nix + ./pkgs.nix ]; } diff --git a/modules/home-manager/pkgs.nix b/modules/home-manager/desktop/pkgs.nix similarity index 65% rename from modules/home-manager/pkgs.nix rename to modules/home-manager/desktop/pkgs.nix index 1c9c566..6b2a7d9 100644 --- a/modules/home-manager/pkgs.nix +++ b/modules/home-manager/desktop/pkgs.nix @@ -19,12 +19,9 @@ swappy mpv vulkan-tools - pkgs.looking-glass-client - tmux - fastfetch - btop - nicotine-plus - strawberry + pkgs.looking-glass-client #vfio + nicotine-plus # p2p file thingy for music/whatever + strawberry # music player pavucontrol wl-clipboard hyprcursor @@ -43,9 +40,9 @@ feh kitty librewolf - fluffychat - element-desktop - piper - libratbag + element-desktop # matrix client + piper #logitech mouse thingy + libratbag # lib for above thingi ]; + programs.vesktop.enable = true; # required like this for stylix ?? } diff --git a/modules/home-manager/desktop/vscode.nix b/modules/home-manager/desktop/vscode.nix index fe91f01..861ad33 100644 --- a/modules/home-manager/desktop/vscode.nix +++ b/modules/home-manager/desktop/vscode.nix @@ -8,6 +8,7 @@ profiles.default.extensions = with pkgs.vscode-extensions; [ pkgs.vscode-extensions.kamadorueda.alejandra pkgs.vscode-extensions.jnoortheen.nix-ide + pkgs.vscode-extensions.leonardssh.vscord ]; profiles.tulg.userSettings = { }; diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index 3c828ff..76ea45d 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -2,6 +2,8 @@ config, pkgs, inputs, + osConfig, + lib, ... }: { imports = [ @@ -9,11 +11,10 @@ ./desktop/default.nix ./pkgs.nix ]; + tulg.desktop.enable = true; # Home Manager settings nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; home.username = "tulg"; home.homeDirectory = "/home/tulg"; home.stateVersion = "25.05"; - - programs.vesktop.enable = true; }