From 426331f908c9f7493cdff79a11c29e9fa9077793 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Wed, 15 Oct 2025 19:45:11 +0100 Subject: [PATCH] cleanup(all): moving all config to hosts folder --- nix/flake.nix | 34 +++-- nix/hosts/doloro-wsl/configuration.nix | 51 +++++++ nix/{ => hosts/doloro-wsl}/home.nix | 0 nix/{ => hosts/doloro}/configuration.nix | 1 + .../doloro}/hardware-configuration.nix | 0 nix/hosts/doloro/home.nix | 126 ++++++++++++++++++ 6 files changed, 201 insertions(+), 11 deletions(-) create mode 100644 nix/hosts/doloro-wsl/configuration.nix rename nix/{ => hosts/doloro-wsl}/home.nix (100%) rename nix/{ => hosts/doloro}/configuration.nix (99%) rename nix/{ => hosts/doloro}/hardware-configuration.nix (100%) create mode 100644 nix/hosts/doloro/home.nix diff --git a/nix/flake.nix b/nix/flake.nix index f48164b..4bd6ff6 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -37,9 +37,9 @@ # Blender-bin url = "github:edolstra/nix-warez?dir=blender"; }; - nixpkgs-gamescope = { - url = "github:Nixos/nixpkgs?rev=8fcb6f1c4948305af52d19f887b89011ee2c080d"; - }; + nixpkgs-gamescope = { + url = "github:Nixos/nixpkgs?rev=8fcb6f1c4948305af52d19f887b89011ee2c080d"; + }; }; outputs = inputs@{ nixpkgs, home-manager, ... }: @@ -59,20 +59,32 @@ extraSpecialArgs = { inherit inputs system; }; - - # Specify your home configuration modules here, for example, - # the path to your home.nix. - modules = [ ./home.nix ]; - - # Optionally use extraSpecialArgs - # to pass through arguments to home.nix + modules = [ ./hosts/doloro/home.nix ]; + }; + homeConfigurations."doloro-wsl" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + extraSpecialArgs = { + inherit inputs system; + }; + modules = [ ./hosts/doloro-wsl/home.nix ]; }; nixosConfigurations.doloroo-main = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs system; }; modules = [ - ./configuration.nix + ./hosts/doloro/configuration.nix + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + { nixpkgs.overlays = overlays; } + ]; + }; + nixosConfigurations.doloroo-laptop-wsl = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs system; + }; + modules = [ + ./hosts/doloro-wsl/configuration.nix inputs.sops-nix.nixosModules.sops inputs.disko.nixosModules.disko { nixpkgs.overlays = overlays; } diff --git a/nix/hosts/doloro-wsl/configuration.nix b/nix/hosts/doloro-wsl/configuration.nix new file mode 100644 index 0000000..3da1f5d --- /dev/null +++ b/nix/hosts/doloro-wsl/configuration.nix @@ -0,0 +1,51 @@ +{ pkgs, lib, ... }: +{ + networking.hostName = "doloro-wsl-laptop"; + programs = { + nh = { + enable = true; + flake = "/home/doloro/dotfiles"; + }; + nix-ld = { + enable = true; + package = pkgs.nix-ld-rs; + }; + }; + virtualisation.podman = { + enable = true; + }; + environment = { + localBinInPath = true; + systemPackages = with pkgs; [ + git + home-manager + ]; + }; + # stylix.base16Scheme = lib.mkForce "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml"; + services.tailscale.enable = true; + networking.firewall.trustedInterfaces = [ "eth0" ]; + systemd.services.firewall.enable = lib.mkForce true; + # modules = { + # users.enable = true; + # secrets.enable = true; + # sshserver.enable = true; + # nix-conf.enable = true; + # shell.enable = true; + # stylix.enable = true; + # hosting = { + # enable = false; + # networking = { + # publicInterface = "eth0"; + # }; + # stacks = { + # test = { + # config = + # { pkgs, ... }: + # { + # environment.systemPackages = with pkgs; [ fastfetch ]; + # }; + # }; + # }; + # }; + # }; +} diff --git a/nix/home.nix b/nix/hosts/doloro-wsl/home.nix similarity index 100% rename from nix/home.nix rename to nix/hosts/doloro-wsl/home.nix diff --git a/nix/configuration.nix b/nix/hosts/doloro/configuration.nix similarity index 99% rename from nix/configuration.nix rename to nix/hosts/doloro/configuration.nix index 18323fa..1b57fc8 100644 --- a/nix/configuration.nix +++ b/nix/hosts/doloro/configuration.nix @@ -48,6 +48,7 @@ # Configure network connections interactively with nmcli or nmtui. networking.networkmanager.enable = true; + networking.firewall.enable = false; security.rtkit.enable = true; diff --git a/nix/hardware-configuration.nix b/nix/hosts/doloro/hardware-configuration.nix similarity index 100% rename from nix/hardware-configuration.nix rename to nix/hosts/doloro/hardware-configuration.nix diff --git a/nix/hosts/doloro/home.nix b/nix/hosts/doloro/home.nix new file mode 100644 index 0000000..2b75c84 --- /dev/null +++ b/nix/hosts/doloro/home.nix @@ -0,0 +1,126 @@ +{ + inputs, + config, + pkgs, + fetchFromGitHub, + ... +}: + +{ + imports = [ + ./modules/hyprland/home.nix + ./modules/quickshell/home.nix + ./modules/chromium/home.nix + #./modules/neovim/home.nix + ./modules/stylix/home.nix + ./modules/nixvim/home.nix + ./modules/tmux/home.nix + ./modules/theme/home.nix + # ./modules/spicetify/home.nix + ./modules/obs/home.nix + ./modules/blender/home.nix + ./modules/fish/home.nix + ./modules/ytm/home.nix + ./overlays.nix + ]; + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "doloro"; + home.homeDirectory = "/home/doloro"; + + programs.git = { + enable = true; + userName = "Doloro1978"; + userEmail = "doloroo@proton.me"; + }; + + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "25.05"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + home.packages = with pkgs; [ + hello + vim + telegram-desktop + vesktop + # spotify + pavucontrol + lazygit + btop + sops + ]; + # sops.age.keyFile = "/home/doloro/.config/sops/age/key.txt"; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. These will be explicitly sourced when using a + # shell provided by Home Manager. If you don't want to manage your shell + # through Home Manager then you have to manually source 'hm-session-vars.sh' + # located at either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/doloro/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + EDITOR = "nvim"; + }; + services = { + dunst = { + enable = true; + }; + }; + # {{{{{ TODO Put in different file + systemd.user.services.pw-discordaudio-virtual-device = { + Install = { + WantedBy = [ "hyprland-session.target" ]; + }; + Service = { + ExecStart = "${pkgs.writeShellScript "discord_audio_virt_device" '' + #!/run/current-system/sw/bin/bash + pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=DiscordSink' -n DiscordSink + ''}"; + }; + }; + systemd.user.services.pw-gameaudio-virtual-device = { + Install = { + WantedBy = [ "hyprland-session.target" ]; + }; + Service = { + ExecStart = "${pkgs.writeShellScript "game_audio_virt_device" '' + #!/run/current-system/sw/bin/bash + pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=GameAudioSink' -n GameAudioSink + ''}"; + }; + }; + # }}}}} + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +}