From 3c86d6ab1c217d6d57bcc8ebb64b16b4f41ed67f Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sat, 11 May 2024 10:08:24 -0400 Subject: [PATCH] move all artemision files into systems/ Signed-off-by: ahuston-0 --- .../systems => systems}/artemision/audio.nix | 0 .../artemision/configuration.nix | 3 +- .../artemision/default.nix | 7 +-- .../artemision/desktop.nix | 0 .../artemision/fingerprint.nix | 0 .../systems => systems}/artemision/fonts.nix | 0 .../artemision/graphics.nix | 0 .../artemision/hardware.nix | 0 .../kernel-patches/panel_power_savings.patch | 0 .../kernel-patches/respect_abmlevel.patch | 0 .../systems => systems}/artemision/polkit.nix | 0 .../artemision}/programs.nix | 54 +++++++++++++++--- .../artemision/secrets.yaml | 0 .../systems => systems}/artemision/steam.nix | 0 .../systems => systems}/artemision/wifi.nix | 0 .../artemision/zerotier.nix | 0 users/alice/systems/artemision/non-server.nix | 56 ------------------- users/alice/systems/artemision/programs.nix | 49 ---------------- users/alice/systems/configuration.nix | 37 ------------ users/alice/systems/non-server.nix | 52 ----------------- 20 files changed, 47 insertions(+), 211 deletions(-) rename {users/alice/systems => systems}/artemision/audio.nix (100%) rename {users/alice/systems => systems}/artemision/configuration.nix (97%) rename {users/alice/systems => systems}/artemision/default.nix (54%) rename {users/alice/systems => systems}/artemision/desktop.nix (100%) rename {users/alice/systems => systems}/artemision/fingerprint.nix (100%) rename {users/alice/systems => systems}/artemision/fonts.nix (100%) rename {users/alice/systems => systems}/artemision/graphics.nix (100%) rename {users/alice/systems => systems}/artemision/hardware.nix (100%) rename {users/alice/systems => systems}/artemision/kernel-patches/panel_power_savings.patch (100%) rename {users/alice/systems => systems}/artemision/kernel-patches/respect_abmlevel.patch (100%) rename {users/alice/systems => systems}/artemision/polkit.nix (100%) rename {users/alice/systems => systems/artemision}/programs.nix (59%) rename {users/alice/systems => systems}/artemision/secrets.yaml (100%) rename {users/alice/systems => systems}/artemision/steam.nix (100%) rename {users/alice/systems => systems}/artemision/wifi.nix (100%) rename {users/alice/systems => systems}/artemision/zerotier.nix (100%) delete mode 100644 users/alice/systems/artemision/non-server.nix delete mode 100644 users/alice/systems/artemision/programs.nix delete mode 100644 users/alice/systems/configuration.nix delete mode 100644 users/alice/systems/non-server.nix diff --git a/users/alice/systems/artemision/audio.nix b/systems/artemision/audio.nix similarity index 100% rename from users/alice/systems/artemision/audio.nix rename to systems/artemision/audio.nix diff --git a/users/alice/systems/artemision/configuration.nix b/systems/artemision/configuration.nix similarity index 97% rename from users/alice/systems/artemision/configuration.nix rename to systems/artemision/configuration.nix index 71fc1b1..f55cd2f 100644 --- a/users/alice/systems/artemision/configuration.nix +++ b/systems/artemision/configuration.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: { imports = [ - ../configuration.nix - ../programs.nix ./programs.nix ./desktop.nix ./wifi.nix @@ -44,6 +42,7 @@ }) { inherit (pkgs) system; }).fwupd; services.fprintd.enable = true; + services.openssh.enable = false; services.spotifyd = { enable = true; diff --git a/users/alice/systems/artemision/default.nix b/systems/artemision/default.nix similarity index 54% rename from users/alice/systems/artemision/default.nix rename to systems/artemision/default.nix index b050b41..b06da2c 100644 --- a/users/alice/systems/artemision/default.nix +++ b/systems/artemision/default.nix @@ -3,14 +3,9 @@ system = "x86_64-linux"; home = true; sops = true; + users = [ "alice" ]; modules = [ inputs.nixos-hardware.nixosModules.framework-16-7040-amd - #({ pkgs, ... }: { - # nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ]; - # environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override { - # extensions = [ "rust-src" "miri" "rust-analyzer" ]; - # }) ]; - #}) { environment.systemPackages = [ inputs.wired-notify.packages.x86_64-linux.default diff --git a/users/alice/systems/artemision/desktop.nix b/systems/artemision/desktop.nix similarity index 100% rename from users/alice/systems/artemision/desktop.nix rename to systems/artemision/desktop.nix diff --git a/users/alice/systems/artemision/fingerprint.nix b/systems/artemision/fingerprint.nix similarity index 100% rename from users/alice/systems/artemision/fingerprint.nix rename to systems/artemision/fingerprint.nix diff --git a/users/alice/systems/artemision/fonts.nix b/systems/artemision/fonts.nix similarity index 100% rename from users/alice/systems/artemision/fonts.nix rename to systems/artemision/fonts.nix diff --git a/users/alice/systems/artemision/graphics.nix b/systems/artemision/graphics.nix similarity index 100% rename from users/alice/systems/artemision/graphics.nix rename to systems/artemision/graphics.nix diff --git a/users/alice/systems/artemision/hardware.nix b/systems/artemision/hardware.nix similarity index 100% rename from users/alice/systems/artemision/hardware.nix rename to systems/artemision/hardware.nix diff --git a/users/alice/systems/artemision/kernel-patches/panel_power_savings.patch b/systems/artemision/kernel-patches/panel_power_savings.patch similarity index 100% rename from users/alice/systems/artemision/kernel-patches/panel_power_savings.patch rename to systems/artemision/kernel-patches/panel_power_savings.patch diff --git a/users/alice/systems/artemision/kernel-patches/respect_abmlevel.patch b/systems/artemision/kernel-patches/respect_abmlevel.patch similarity index 100% rename from users/alice/systems/artemision/kernel-patches/respect_abmlevel.patch rename to systems/artemision/kernel-patches/respect_abmlevel.patch diff --git a/users/alice/systems/artemision/polkit.nix b/systems/artemision/polkit.nix similarity index 100% rename from users/alice/systems/artemision/polkit.nix rename to systems/artemision/polkit.nix diff --git a/users/alice/systems/programs.nix b/systems/artemision/programs.nix similarity index 59% rename from users/alice/systems/programs.nix rename to systems/artemision/programs.nix index 2d5d242..bb7bd6d 100644 --- a/users/alice/systems/programs.nix +++ b/systems/artemision/programs.nix @@ -1,62 +1,98 @@ -{ - pkgs, - config, - inputs, - ... -}: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ - bfg-repo-cleaner + alacritty + amdgpu_top + bat bitwarden-cli - candy-icons + bfg-repo-cleaner + brightnessctl + btop calibre # calibre dedrm? + candy-icons cinnamon.nemo + croc + deadnix + direnv discord-canary eza fanficfare ferium + fd + file firefox # gestures replacement git glances gpu-viewer + grim headsetcontrol + htop + hwloc ipmiview + iperf3 ipscan + jp2a + jq kitty libtool + lsof + lynis masterpdfeditor4 mons # nbt explorer? + ncdu + neofetch neovim + nix-init + nix-output-monitor + nix-prefetch + nix-tree + nixpkgs-fmt + nmap noisetorch ocrmypdf + pciutils playonlinux protonmail-bridge protontricks + qrencode redshift restic ripgrep rpi-imager rofi-wayland + signal-desktop # signal in tray? siji simple-mtpfs slack + slurp + smartmontools snyk sops spotify spotify-player #swaylock/waylock? sweet-nova + telegram-desktop + terraform + tig + tokei + tree + unzip unipicker + uutils-coreutils-noprefix ventoy vscode watchman + wget + wl-clipboard xboxdrv yubioath-flutter + zoom-us + zoxide zoom ]; - # ++ [ inputs.wired.packages.${system}.wired ]; } diff --git a/users/alice/systems/artemision/secrets.yaml b/systems/artemision/secrets.yaml similarity index 100% rename from users/alice/systems/artemision/secrets.yaml rename to systems/artemision/secrets.yaml diff --git a/users/alice/systems/artemision/steam.nix b/systems/artemision/steam.nix similarity index 100% rename from users/alice/systems/artemision/steam.nix rename to systems/artemision/steam.nix diff --git a/users/alice/systems/artemision/wifi.nix b/systems/artemision/wifi.nix similarity index 100% rename from users/alice/systems/artemision/wifi.nix rename to systems/artemision/wifi.nix diff --git a/users/alice/systems/artemision/zerotier.nix b/systems/artemision/zerotier.nix similarity index 100% rename from users/alice/systems/artemision/zerotier.nix rename to systems/artemision/zerotier.nix diff --git a/users/alice/systems/artemision/non-server.nix b/users/alice/systems/artemision/non-server.nix deleted file mode 100644 index 9f8c990..0000000 --- a/users/alice/systems/artemision/non-server.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - # Adds some items from the server config without importing everything - security.auditd.enable = true; - - i18n = { - defaultLocale = "en_US.utf8"; - supportedLocales = [ "en_US.UTF-8/UTF-8" ]; - }; - - boot = { - default = true; - }; - - users = { - defaultUserShell = pkgs.zsh; - }; - - networking = { - firewall = { - enable = lib.mkDefault true; - allowedTCPPorts = [ ]; - }; - }; - - # programs = { - # zsh = { - # enable = true; - # syntaxHighlighting.enable = true; - # zsh-autoenv.enable = true; - # enableCompletion = true; - # enableBashCompletion = true; - # ohMyZsh.enable = true; - # autosuggestions = { - # enable = true; - # strategy = [ "completion" ]; - # async = true; - # }; - # }; - # }; - - nix = { - - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - }; -} diff --git a/users/alice/systems/artemision/programs.nix b/users/alice/systems/artemision/programs.nix deleted file mode 100644 index 51a0b1f..0000000 --- a/users/alice/systems/artemision/programs.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - alacritty - amdgpu_top - bat - brightnessctl - btop - croc - deadnix - direnv - fd - file - grim - htop - hwloc - iperf3 - jp2a - jq - lsof - lynis - ncdu - neofetch - nix-init - nix-output-monitor - nix-prefetch - nix-tree - nixpkgs-fmt - nmap - pciutils - qrencode - ripgrep - signal-desktop - slurp - smartmontools - telegram-desktop - terraform - tig - tokei - tree - unzip - uutils-coreutils-noprefix - ventoy - wget - wl-clipboard - zoom-us - zoxide - ]; -} diff --git a/users/alice/systems/configuration.nix b/users/alice/systems/configuration.nix deleted file mode 100644 index 80d59bd..0000000 --- a/users/alice/systems/configuration.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - imports = [ ./non-server.nix ]; - - services.fwupd.enable = true; - - nix.settings = { - substituters = [ - "https://cache.nixos.org/?priority=1&want-mass-query=true" - "https://attic.alicehuston.xyz/cache-nix-dot?priority=4&want-mass-query=true" - "https://cache.alicehuston.xyz/?priority=5&want-mass-query=true" - "https://nix-community.cachix.org/?priority=10&want-mass-query=true" - ]; - trusted-substituters = [ - "https://cache.nixos.org" - "https://attic.alicehuston.xyz/cache-nix-dot" - "https://cache.alicehuston.xyz" - "https://nix-community.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "cache.alicehuston.xyz:SJAm8HJVTWUjwcTTLAoi/5E1gUOJ0GWum2suPPv7CUo=%" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache-nix-dot:0hp/F6mUJXNyZeLBPNBjmyEh8gWsNVH+zkuwlWMmwXg=" - ]; - trusted-users = [ - "root" - "@wheel" - ]; - }; -} diff --git a/users/alice/systems/non-server.nix b/users/alice/systems/non-server.nix deleted file mode 100644 index 1f51183..0000000 --- a/users/alice/systems/non-server.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - # Adds some items from the server config without importing everything - security.auditd.enable = true; - - i18n = { - defaultLocale = "en_US.utf8"; - supportedLocales = [ "en_US.UTF-8/UTF-8" ]; - }; - - boot = { - default = true; - }; - - users = { - defaultUserShell = pkgs.zsh; - }; - - networking = { - firewall = { - enable = lib.mkDefault true; - allowedTCPPorts = [ ]; - }; - }; - - services.openssh.enable = false; - services.autopull = { - enable = false; - ssh-key = "/root/.ssh/id_ed25519_ghdeploy"; - path = /root/dotfiles; - }; - - programs.zsh = { - enable = true; - syntaxHighlighting.enable = true; - zsh-autoenv.enable = true; - enableCompletion = true; - enableBashCompletion = true; - ohMyZsh.enable = true; - autosuggestions = { - enable = true; - strategy = [ "completion" ]; - async = true; - }; - }; -}