diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/adam/audio.nix | 11 | ||||
| -rw-r--r-- | hosts/adam/configuration.nix | 79 | ||||
| -rw-r--r-- | hosts/adam/home.nix | 49 | ||||
| -rw-r--r-- | hosts/lilith/configuration.nix | 37 | ||||
| -rw-r--r-- | hosts/lilith/home.nix | 34 | ||||
| -rw-r--r-- | hosts/sachiel/configuration.nix | 5 |
6 files changed, 74 insertions, 141 deletions
diff --git a/hosts/adam/audio.nix b/hosts/adam/audio.nix deleted file mode 100644 index e34b073..0000000 --- a/hosts/adam/audio.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; -} diff --git a/hosts/adam/configuration.nix b/hosts/adam/configuration.nix index d391b64..88defa1 100644 --- a/hosts/adam/configuration.nix +++ b/hosts/adam/configuration.nix @@ -1,16 +1,17 @@ { - pkgs, + inputs, + system, host, + pkgs, username, ... }: { - imports = [ ./hardware-configuration.nix - ./audio.nix - ./wooting.nix + ../../modules + ../../modules/system ]; boot = { @@ -51,59 +52,37 @@ environment.variables.AMD_VULKAN_ICD = "RADV"; - # Network - networking = { - hostName = host; - networkmanager.enable = true; - }; + home-manager.users.${username} = { + home.username = username; + home.homeDirectory = "/home/${username}"; - # Improve startup time - systemd.services.NetworkManager-wait-online.enable = false; + programs.home-manager.enable = true; - # Time - time.timeZone = "Europe/Berlin"; + home.packages = with pkgs; [ + obsidian + firefox + imv + mpv - # Keymap - console.keyMap = "de"; + nextcloud-client - # User - users.users.${username} = { - isNormalUser = true; - extraGroups = [ - "networkmanager" - "wheel" - "video" - "input" + xdg-utils + pulsemixer ]; - shell = pkgs.zsh; - ignoreShellProgramCheck = true; + home.stateVersion = "25.05"; }; - services = { - openssh.enable = true; - gnome.gnome-keyring.enable = true; - }; - - xdg.portal = { - enable = true; - wlr.enable = true; - }; - - security.polkit.enable = true; - - programs.dconf.enable = true; - - # Mullvad vpn - services.mullvad-vpn = { - enable = true; - package = pkgs.mullvad-vpn; - }; - - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - nixpkgs.config.allowUnfree = true; + nx.desktop.sway.enable = true; + nx.desktop.waybar.enable = true; + nx.desktop.dunst.enable = true; + nx.programs.gh.enable = true; + nx.programs.gpg.enable = true; + nx.programs.neovim.enable = true; + nx.programs.tmux.enable = true; + nx.programs.zsh.enable = true; + nx.programs.foot.enable = true; + nx.programs.spicetify.enable = true; + nx.programs.zathura.enable = true; system.stateVersion = "25.05"; } diff --git a/hosts/adam/home.nix b/hosts/adam/home.nix index ebdfa59..8f22d97 100644 --- a/hosts/adam/home.nix +++ b/hosts/adam/home.nix @@ -5,51 +5,10 @@ ../../modules/home-manager ]; - home.username = username; - home.homeDirectory = "/home/${username}"; - - programs.home-manager.enable = true; - - home.packages = with pkgs; [ - obsidian - firefox - imv - mpv - - xdg-utils - pulsemixer - - # fonts - noto-fonts - noto-fonts-cjk-sans + noto-fonts-cjk-sans noto-fonts-emoji ]; - gtk = { - enable = true; - theme = { - name = "Adwaita-dark"; - package = pkgs.gnome-themes-extra; - }; - gtk3.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme=1 - ''; - }; - gtk4.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme=1 - ''; - }; - }; - - home.pointerCursor = { - gtk.enable = true; - name = "Adwaita"; - package = pkgs.adwaita-icon-theme; - size = 24; - }; - programs.zsh.shellAliases = { open = "xdg-open"; }; @@ -57,9 +16,11 @@ dev.enable = true; sway.enable = true; - dunst.enable = true; - waybar.enable = true; foot.enable = true; + waybar.enable = true; + dunst.enable = true; + hyprlock.enable = true; + spicetify.enable = true; zathura.enable = true; nixcord.enable = true; diff --git a/hosts/lilith/configuration.nix b/hosts/lilith/configuration.nix index 897fc1d..390a8a3 100644 --- a/hosts/lilith/configuration.nix +++ b/hosts/lilith/configuration.nix @@ -1,10 +1,43 @@ -{ host, username, ... }: +{ + pkgs, + host, + username, + ... +}: { + imports = [ + ../../modules + ]; + users.users.${username}.home = "/Users/${username}"; networking.hostName = host; + home-manager.users.${username} = { + home.username = username; + home.homeDirectory = "/Users/${username}"; + + programs.home-manager.enable = true; + + home.packages = with pkgs; [ + htop + ffmpeg + wget + imagemagick + + gcc + maven + cmake + gnupg + lua + + zathura + + nerd-fonts.symbols-only + ]; + }; + system.primaryUser = username; system.defaults = { dock = { @@ -49,5 +82,7 @@ onActivation.upgrade = true; }; + nx. + system.stateVersion = 5; } diff --git a/hosts/lilith/home.nix b/hosts/lilith/home.nix deleted file mode 100644 index 55af127..0000000 --- a/hosts/lilith/home.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs, username, ... }: - -{ - imports = [ - ../../modules/home-manager - ]; - - home.username = username; - home.homeDirectory = "/Users/${username}"; - - home.packages = with pkgs; [ - htop - ffmpeg - wget - imagemagick - - gcc - maven - cmake - gnupg - lua - - zathura - - nerd-fonts.symbols-only - ]; - - dev.enable = true; - spicetify.enable = true; - latex.enable = true; - anki.enable = true; - - home.stateVersion = "25.05"; -} diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix index 4a9b297..4372836 100644 --- a/hosts/sachiel/configuration.nix +++ b/hosts/sachiel/configuration.nix @@ -183,7 +183,10 @@ ]; repo = "h8xn8qvo@h8xn8qvo.repo.borgbase.com:repo"; encryption.mode = "none"; - environment.BORG_RSH = "ssh -i /home/${username}/.ssh/borgbase-nextcloud -o StrictHostKeyChecking=accept-new"; + environment = { + BORG_RSH = "ssh -i /home/${username}/.ssh/borgbase-nextcloud -o StrictHostKeyChecking=accept-new"; + TMPDIR = "/var/tmp"; + }; compression = "auto,lzma"; startAt = "daily"; readWritePaths = [ |