diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 15 | ||||
| -rw-r--r-- | home/nipsy/prometheus.nix | 6 | ||||
| -rw-r--r-- | home/root/prometheus.nix | 6 | ||||
| -rw-r--r-- | home/trent/common/core/bash.nix | 10 | ||||
| -rw-r--r-- | home/trent/common/core/default.nix | 32 | ||||
| -rw-r--r-- | home/trent/common/core/git.nix | 13 | ||||
| -rw-r--r-- | home/trent/common/core/tmux/default.nix | 6 | ||||
| -rw-r--r-- | home/trent/common/core/tmux/tmux.conf | 34 | ||||
| -rw-r--r-- | home/trent/common/core/vim/default.nix | 6 | ||||
| -rw-r--r-- | home/trent/common/core/vim/vimrc | 47 | ||||
| -rw-r--r-- | home/trent/common/core/zsh/default.nix | 51 | ||||
| -rw-r--r-- | home/trent/common/core/zsh/zshrc | 128 | ||||
| -rw-r--r-- | home/trent/prometheus.nix | 62 | ||||
| -rw-r--r-- | hosts/common/users/trent/default.nix | 34 | ||||
| -rw-r--r-- | hosts/common/users/trent/keys/id.pub | 1 | ||||
| -rw-r--r-- | hosts/prometheus/default.nix | 133 | ||||
| -rw-r--r-- | hosts/prometheus/disks.nix | 101 | ||||
| -rw-r--r-- | hosts/prometheus/hardware-configuration.nix | 41 |
18 files changed, 0 insertions, 726 deletions
@@ -356,21 +356,6 @@ ]; }; - prometheus = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - disko.nixosModules.disko - ./hosts/prometheus - home-manager.nixosModules.home-manager { - #home-manager.sharedModules = [ sops-nix.homeManagerModules.sops ]; - home-manager.users.root = import ./home/root/prometheus.nix; - home-manager.users.nipsy = import ./home/nipsy/prometheus.nix; - home-manager.users.trent = import ./home/trent/prometheus.nix; - } - #sops-nix.nixosModules.sops - ]; - }; - richese = nixpkgs.lib.nixosSystem rec { specialArgs = { inherit inputs outputs; }; modules = [ diff --git a/home/nipsy/prometheus.nix b/home/nipsy/prometheus.nix deleted file mode 100644 index 83c92cd..0000000 --- a/home/nipsy/prometheus.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ inputs, lib, pkgs, config, outputs, ... }: -{ - imports = [ - common/core - ]; -} diff --git a/home/root/prometheus.nix b/home/root/prometheus.nix deleted file mode 100644 index 83c92cd..0000000 --- a/home/root/prometheus.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ inputs, lib, pkgs, config, outputs, ... }: -{ - imports = [ - common/core - ]; -} diff --git a/home/trent/common/core/bash.nix b/home/trent/common/core/bash.nix deleted file mode 100644 index 77f0cf4..0000000 --- a/home/trent/common/core/bash.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - programs.bash = { - enable = true; - enableCompletion = true; - shellAliases = { - ll = "ls -alF --color=auto"; - la = "ls -aF --color=auto"; - }; - }; -} diff --git a/home/trent/common/core/default.nix b/home/trent/common/core/default.nix deleted file mode 100644 index e8e9646..0000000 --- a/home/trent/common/core/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, lib, pkgs, outputs, ... }: -{ - imports = [ - ./bash.nix - ./git.nix - ./tmux - ./vim - ./zsh - ]; - - home = { - username = lib.mkDefault "trent"; - homeDirectory = lib.mkDefault "/home/${config.home.username}"; - stateVersion = lib.mkDefault "26.05"; - }; - - #home.packages = builtins.attrValues { - # inherit (pkgs) - # wget - # zip; - #}; - - nix = { - package = lib.mkDefault pkgs.nix; - settings = { - experimental-features = [ "nix-command" "flakes" ]; - warn-dirty = false; - }; - }; - - programs.home-manager.enable = true; -} diff --git a/home/trent/common/core/git.nix b/home/trent/common/core/git.nix deleted file mode 100644 index 15c9a4c..0000000 --- a/home/trent/common/core/git.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - programs.git = { - enable = true; - settings = { - pull.rebase = true; - #user = { - # email = "nipsy@bitgnome.net"; - # name = "Mark Nipper"; - #}; - }; - signing.format = null; - }; -} diff --git a/home/trent/common/core/tmux/default.nix b/home/trent/common/core/tmux/default.nix deleted file mode 100644 index e7873f8..0000000 --- a/home/trent/common/core/tmux/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.tmux = { - enable = true; - extraConfig = (builtins.readFile ./tmux.conf); - }; -} diff --git a/home/trent/common/core/tmux/tmux.conf b/home/trent/common/core/tmux/tmux.conf deleted file mode 100644 index 479a896..0000000 --- a/home/trent/common/core/tmux/tmux.conf +++ /dev/null @@ -1,34 +0,0 @@ -#set-option -ga terminal-overrides ",st-256color:Tc" -#set -as terminal-features ",foot*:RGB" -#set -as terminal-features ",st-256color:RGB" -set -ga monitor-bell on -set -g history-limit 100000 -set -g bell-action any -#set -g bell-on-alert on - -set -s escape-time 0 - -setw -g aggressive-resize on -setw -g wrap-search off - -bind-key a send-prefix -bind-key k kill-session -#bind-key H pipe-pane -o 'cat >> ~/.tmux.log.#h-#S-#I-#P' - -#bind-key m \ -# set -g mouse on \;\ -# display 'Mouse: ON' -#bind M \ -# set -g mouse off \;\ -# display 'Mouse: OFF' - -# vim-like copypaste mode -set-window-option -g mode-keys vi -bind-key -T copy-mode-vi v send -X begin-selection -bind-key -T copy-mode-vi y send -X copy-pipe "xclip -selection clipboard" -bind-key -T copy-mode-vi C-v send -X rectangle-toggle -bind-key P run "tmux set-buffer \"$(xclip -o -selection clipboard)\"; tmux paste-buffer" - -# don't exit copy mode after selection -#set -s mouse on -#bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-selection -x diff --git a/home/trent/common/core/vim/default.nix b/home/trent/common/core/vim/default.nix deleted file mode 100644 index ea4ed5e..0000000 --- a/home/trent/common/core/vim/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.vim = { - enable = true; - extraConfig = (builtins.readFile ./vimrc); - }; -} diff --git a/home/trent/common/core/vim/vimrc b/home/trent/common/core/vim/vimrc deleted file mode 100644 index 87de2a0..0000000 --- a/home/trent/common/core/vim/vimrc +++ /dev/null @@ -1,47 +0,0 @@ -" Handling of big files - William Natter, Tony Mechelynck and others -" fairly certain that BufSizeThreshold is in bytes -let g:SaveUndoLevels = &undolevels -let g:BufSizeThreshold = 5242880 -if has("autocmd") - au VimEnter * let g:SaveUndoLevels = &undolevels - au BufReadPre * if getfsize(expand("%")) >= g:BufSizeThreshold | setlocal noswapfile | endif - au BufEnter * if getfsize(expand("%")) < g:BufSizeThreshold | let &undolevels=g:SaveUndoLevels | else | setlocal undolevels=-1 | endif - au BufEnter * if getfsize(expand("%")) < g:BufSizeThreshold | syntax on | else | syntax off | endif -endif - -set mouse& -set noautoindent " always set autoindenting off - -" enable better 24-bit color support -"let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum" -"let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum" -set termguicolors - -" If using a dark background within the editing area and syntax highlighting -" turn on this option as well -set background=dark - -if has("autocmd") - " Enabled file type detection - " Use the default filetype settings. If you also want to load indent files - " to automatically do language-dependent indenting add 'indent' as well. - filetype plugin on - "filetype indent on -endif " has ("autocmd") - -" The following are commented out as they cause vim to behave a lot -" different from regular vi. They are highly recommended though. -set showcmd " Show (partial) command in status line. -set showmatch " Show matching brackets. -set ignorecase " Do case insensitive matching -set incsearch " Incremental search -"set expandtab " replace tabs with spaces -set smarttab " use shiftwidth instead of tabstop at start of line -set spell spelllang=en_us " turn on the spell check -set hlsearch " highlight all search matches - -set laststatus=2 -set statusline=%<%f%h%m%r%=%{&ff}\ %Y\ %b\ 0x%B\ \ %l,%c%V\ %P - -"map <F5> :w<CR><bar>:!clear;go run %<CR> -"map <F6> :w<CR><bar>:%! gofmt<CR> diff --git a/home/trent/common/core/zsh/default.nix b/home/trent/common/core/zsh/default.nix deleted file mode 100644 index 8c84501..0000000 --- a/home/trent/common/core/zsh/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, pkgs, ... }: -{ - programs.zsh = { - enable = true; - - history = { - save = 100000; - size = 100000; - }; - - initContent = (builtins.readFile ./zshrc); - - sessionVariables = let makePluginPath = format: - (lib.strings.makeSearchPath format [ - "$HOME/.nix-profile/lib" - "/run/current-system/sw/lib" - "/etc/profiles/per-user/$USER/lib" - ]) + ":$HOME/.${format}"; - in { - _JAVA_AWT_WM_NONREPARENTING = 1; # fix stupid broken Java shit - BROWSER = "firefox"; - COLORFGBG = ";0"; - #COLORFGBG = "green;blue"; - #COLORTERM = "truecolor"; - EDITOR = "vim"; - LC_COLLATE = "C"; - PAGER = "less"; - #PASSWORD_STORE_ENABLE_EXTENSIONS = "true"; - PATH = "$HOME/bin:$PATH"; - #PS1 = "%B%n%b@%U%m%u/%l:%~> "; - QUOTING_STYLE = "literal"; - }; - - shellAliases = { - FIXCAPS = "xdotool key Caps_Lock"; - fixkeyboard = "setxkbmap -layout us -option caps:super -option compose:ralt"; - ftp = "${pkgs.inetutils}/bin/ftp"; - #geniso = "nix build ~/git/nix/nipsy#nixosConfigurations.iso.config.system.build.isoImage && ll result/iso/*iso"; - grep = "grep --color=auto"; - ip = "ip -c=auto"; - la = "ls -aF --color=auto"; - ll = "ls -alFhs --color=auto"; - #lock = "xscreensaver-command -lock"; - nix-list-derivations = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq"; - nix-list-generations = "nixos-rebuild list-generations"; - steam-no-beta = "steam -clearbeta"; - telnet = "${pkgs.inetutils}/bin/telnet"; - zgrep = "zgrep --color=auto"; - }; - }; -} diff --git a/home/trent/common/core/zsh/zshrc b/home/trent/common/core/zsh/zshrc deleted file mode 100644 index 08d4025..0000000 --- a/home/trent/common/core/zsh/zshrc +++ /dev/null @@ -1,128 +0,0 @@ -umask 022 - -# remote gpg-agent handling -if [[ ${HOST} == "arrakis.bitgnome.net" ]]; then - if [[ ! -d /run/user/1000/gnupg ]]; then - gpgconf --create-socketdir - fi -fi - -eval $(dircolors) - -# set SWAYSOCK correctly -if pgrep -U nipsy -x sway >/dev/null; then - export SWAYSOCK=/run/user/$(id -u)/sway-ipc.$(id -u).$(pgrep -x sway).sock -fi - -# start sway by default if logging into tty1 -if [[ -z "${DISPLAY}" ]] && [[ $(tty) == "/dev/tty1" ]]; then - - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - - # set some Wayland specific variables - export ELECTRON_OZONE_PLATFORM_HINT=auto - export MOZ_ENABLE_WAYLAND=1 - export GDK_BACKEND=wayland - export QT_QPA_PLATFORM=wayland - export SDL_VIDEODRIVER=wayland - export XDG_SESSION_TYPE=wayland - - exec sway > ~/.sway.log - -fi - -# completion options -setopt LIST_PACKED MENU_COMPLETE -# expansion and globbing options -setopt NO_NOMATCH -# history options -setopt SHARE_HISTORY EXTENDED_HISTORY HIST_FCNTL_LOCK HIST_IGNORE_ALL_DUPS HIST_REDUCE_BLANKS HIST_SAVE_NO_DUPS -# input/output options -setopt PRINT_EXIT_VALUE RM_STAR_SILENT -# job control options -setopt LONG_LIST_JOBS NO_HUP -# zle options -setopt NO_BEEP - -# menu completion -zstyle ':completion:*' menu select=5 - -# vi keybindings and settings -bindkey -v -export KEYTIMEOUT=1 -autoload -U edit-command-line -zle -N edit-command-line -bindkey -M vicmd v edit-command-line - -# always open tmux if interactive -[[ $- != *i* ]] && return -#[[ -z "$TMUX" ]] && (tmux -2 new-session -t default \; new-window || tmux -2 new-session -s default) -[[ -z "$TMUX" ]] && (tmux -2 attach -t default || tmux -2 new-session -s default) - -# useful helper functions -function nix-file-list { find $(nix build ${1} --print-out-paths --no-link) } - -function ntrace { - - if [[ -z ${argv} ]]; then - echo 'you must specify a command to strace!' >&2 - return 1 - fi - - eval strace -f -e trace=network -s 10000 ${=argv[@]} - -} - -# prompt/theme shit -function precmd { - - local RC=${?} - #local RC=${(%)RC-%?} - - print -nP '\n' - - # current user - if [[ ${EUID} -eq 0 ]]; then - print -nP '%{%S%F{red}%}%n%{%f%s%}' - else - print -nP '%{%F{magenta}%}%n%{%f%}' - fi - - print -nP '@' - - # current host - if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then - print -nP '%{%F{yellow}%}%m%{%f%}' - else - print -nP '%{%F{green}%}%m%{%f%}' - fi - - # connected terminal - print -nP '/%{%U%}%l%{%u%} ' - - # cwd - print -nP '%{%F{cyan}%}%~%{%f%} ' - - # job count - JOBCOUNT='%j' - if [[ ${(%)JOBCOUNT} -gt 0 ]]; then - print -nP 'j=%{%F{yellow}%}%j%{%f%} ' - fi - - # previous return code - if [[ ${RC} -ne 0 ]]; then - print -nP 'rc=%{%F{red}%}' - echo -n "${RC}" - print -nP '%{%f%} ' - else - print -nP 'rc=%{%F{green}%}' - echo -n "${RC}" - print -nP '%{%f%} ' - fi - - # time stamp - print -P '%{%F{cyan}%}%D{%FT%T%z}%{%f%}' - -} - -PS1='%# ' diff --git a/home/trent/prometheus.nix b/home/trent/prometheus.nix deleted file mode 100644 index 8919297..0000000 --- a/home/trent/prometheus.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ inputs, lib, pkgs, config, outputs, ... }: -{ - imports = [ - common/core - #common/optional/desktops - #common/optional/desktops/i3 - #common/optional/desktops/services/xscreensaver.nix - #common/optional/desktops/sway - #common/optional/desktops/xdg.nix - #common/optional/secrets.nix - #inputs.sops-nix.homeManagerModules.sops - ]; - - home.file = { - #".mailcap".text = '' - # #application/msword; antiword -rs '%s'; copiousoutput; description=Microsoft Word Document - # application/pdf; pdftotext '%s' -; copiousoutput; description=Adobe Portable Document Format - # #image/gif; asciiview -driver curses -dim -bold -reverse -normal -boldfont -extended -eight '%s'; description=GIF image - # image/gif; sxiv '%s'; description=GIF image - # #image/jpeg; asciiview -driver curses -dim -bold -reverse -normal -boldfont -extended -eight '%s'; description=JPEG image - # image/jpeg; sxiv '%s'; description=JPEG image - # image/png; sxiv '%s'; description=PNG image - # text/html; elinks -dump %s; copiousoutput - # #text/richtext; catdoc '%s'; copiousoutput; description=Microsoft Rich Text Format - #''; - #".mutt/aliases".source = ./arrakis/mutt/aliases; - #".mutt/colors".source = ./arrakis/mutt/colors; - #".mutt/headers".source = ./arrakis/mutt/headers; - #".mutt/keys".source = ./arrakis/mutt/keys; - #".mutt/muttrc".source = ./arrakis/mutt/muttrc; - "bin/knock".source = ../common/scripts/knock; - }; - - programs.zsh = { - shellAliases = { - #manage = "tmux new-window ssh -A root@arrakis\\; split-window -d ssh -A root@darkstar\\; split-window -d ssh root@king\\; new-window ssh root@black-sheep\\; split-window -d ssh root@fangorn\\; split-window -d ssh root@treebeard\\; new-window ssh root@casey\\; split-window -d ssh root@homer\\; new-window ssh root@lilnasx\\; split-window -d ssh root@trent"; - }; - }; - - #sops = { - # age.keyFile = "/home/trent/.config/sops/age/keys.txt"; - # defaultSopsFile = ./secrets/prometheus.yaml; - - # secrets = { - # "reaper_license" = { - # path = "/home/trent/.config/REAPER/reaper-license.rk"; - # }; - # "ssh_config" = { - # path = "/home/trent/.ssh/config"; - # }; - # }; - #}; - - #xsession = { - # initExtra = '' - # xrandr --output DisplayPort-0 --primary --mode 2560x1440 --rate 170 - - # # disable VRR because it causes the display to go to sleep on my GeForce 1080 (now 3070 Ti) sometimes; maybe monitor related? - # #nvidia-settings -a AllowVRR=0 - # ''; - #}; -} diff --git a/hosts/common/users/trent/default.nix b/hosts/common/users/trent/default.nix deleted file mode 100644 index 47c6ead..0000000 --- a/hosts/common/users/trent/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs, inputs, config, ... }: -let - ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; - uid = 1001; -in -{ - users.groups.trent.gid = uid; - users.users.trent = { - description = "Trent Guthrie"; - extraGroups = [ - "audio" - "video" - "wheel" - ] ++ ifTheyExist [ - "adbusers" - "dialout" - "gamemode" - "networkmanager" - "vboxsf" - "vboxusers" - ]; - group = "trent"; - home = "/home/trent"; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - (builtins.readFile ./keys/id.pub) - #(builtins.readFile ./keys/id_other.pub) - ]; - - packages = [ pkgs.home-manager ]; - shell = pkgs.bash; - uid = uid; - }; -} diff --git a/hosts/common/users/trent/keys/id.pub b/hosts/common/users/trent/keys/id.pub deleted file mode 100644 index 64c40b2..0000000 --- a/hosts/common/users/trent/keys/id.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDgE6nQFzqn3dx9UHqn3HbMkFszgpxHMUF8fOWeRz6pS7jBdLP+as4Bb15l5EvfusuQCe63KVlcN1qsZNWXErjYzhrUrAZPzy6xy3BOOjflh3tBV7PqGZmxrJzbwBsYbvYCzjBer1lAOn0b45y+KzO33vYe+o7w/OgQ7jaGrK2dAksyZyjTW6ii5X8/bZVghFocJSKQJmwdXuhyolLAtYvltS3dFOuviQww3sGNJeXSeOtvWf8N1xuL17bOS8nfLWXUHiIHby66mdSrBSx0TsgqtgtvFVL7tg4x72HWKjzFeiw6CVBO+UB7rM5ViDXHHKXpQ/Ju0K4/+/C06DWUglDip/2VtXSnjPocg6G6hITgp9Y0EqhX+sLOKzUL+6VxIYRrSx66ibeXMLGS/kkmM4OSHHM3mPVFcNtAnNjORLv5RfmLVTywCMeMXjZUEzxgJ6qKrhSH34bfEYZfxzciQMaoMOx3z5O2ncc1G3qN7DLFxROuV93zXD+94u1n8waiBhmixc1ZlN/JiIhuI2OX8nA0OV8vg9bDmZVhu1wyk+2Xx5syrz7FQQbp1QQQzaFGG8WtMegq0nQBER0zvzdtp2qxpAUBF6Md7YB1dU2Y5mpYk7Pu8LeVC5sxUjd869yL3nK8f0CseCfoZFLXtKD6V80WixBn61rRiazG54fDPIeBZQ== tguth01@hotmail.com diff --git a/hosts/prometheus/default.nix b/hosts/prometheus/default.nix deleted file mode 100644 index 9390d43..0000000 --- a/hosts/prometheus/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ config, inputs, outputs, pkgs, ... }: { - boot = { - initrd.kernelModules = [ "zfs" ]; - kernel.sysctl = { - "kernel.hostname" = "prometheus.trentguthrie.net"; - #"kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/ - #"net.ipv4.tcp_congestion_control" = "reno"; - }; - kernelPackages = pkgs.master.linuxPackages_7_0; - #kernelParams = [ - # "amdgpu.ppfeaturemask=0xfffd3fff" - # "split_lock_detect=off" - #]; - loader = { - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/efiboot/efi1"; - }; - systemd-boot = { - enable = true; - memtest86.enable = true; - }; - timeout = 3; - }; - supportedFilesystems = [ "zfs" ]; - zfs = { - forceImportRoot = true; - package = pkgs.master.zfs_2_4; - }; - }; - - environment.systemPackages = [ - pkgs.linux-firmware - pkgs.master.linuxKernel.packages.linux_7_0.turbostat - pkgs.mailutils - ]; - - imports = [ - ./disks.nix - ./hardware-configuration.nix - ../common/core - #../common/optional/db.nix - #../common/optional/dev.nix - #../common/optional/ebooks.nix - #../common/optional/games.nix - #../common/optional/google-authenticator.nix - #../common/optional/gui.nix - #../common/optional/misc.nix - #../common/optional/multimedia.nix - #../common/optional/pipewire.nix - #../common/optional/printer.nix - #../common/optional/sdr.nix - #../common/optional/services/chrony.nix - ../common/optional/services/openssh.nix - #../common/optional/services/wayland.nix - #../common/optional/services/xorg.nix - #../common/optional/sound.nix - #../common/optional/wdt.nix - ../common/optional/zfs.nix - ../common/users/nipsy - ../common/users/root - ../common/users/trent - ]; - - networking = { - defaultGateway = { - address = "10.0.1.1"; - interface = "enp89s0"; - }; - hostId = "a227ce4d"; - hostName = "prometheus"; - interfaces = { - enp89s0 = { - ipv4.addresses = [ - { address = "10.0.1.17"; prefixLength = 24; } - ]; - }; - }; - nameservers = [ "10.0.1.1" ]; - nftables.enable = true; - search = [ - "trentguthrie.net" - ]; - useDHCP = false; - #wireless = { - # enable = true; - # networks = { - # "Crystal Palace" = { - # pskRaw = "ext:psk_crystal_palace"; - # }; - # }; - # secretsFile = "${config.sops.secrets."wpa_supplicant".path}"; - #}; - }; - - nixpkgs = { - config = { - allowUnfree = true; - }; - hostPlatform = "x86_64-linux"; - overlays = [ - inputs.nvidia-patch.overlays.default - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.master-packages - #outputs.overlays.my-nixpkgs-packages - #outputs.overlays.pr495610-packages - outputs.overlays.stable-packages - #outputs.overlays.staging-packages - #outputs.overlays.wine9_22-packages - ]; - }; - - services.openssh.settings.X11Forwarding = true; - #services.xserver.videoDrivers = [ "amdgpu" ]; - - #sops = { - # age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - # defaultSopsFile = ../secrets/caladan.yaml; - - # secrets = { - # "nftables/ssh" = {}; - # "nix-access-token-github" = {}; - # "ssh_config".path = "/root/.ssh/config"; - # #"wpa_supplicant" = { - # # group = config.users.users.wpa_supplicant.group; - # # owner = config.users.users.wpa_supplicant.name; - # #}; - # }; - #}; - - system.stateVersion = "26.05"; -} diff --git a/hosts/prometheus/disks.nix b/hosts/prometheus/disks.nix deleted file mode 100644 index c58effa..0000000 --- a/hosts/prometheus/disks.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - disko.devices = { - disk = { - nvme0n1 = { - type = "disk"; - device = "/dev/disk/by-id/nvme-SPCC_M.2_PCIe_SSD_WWDD241018006012188"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "1G"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/efiboot/efi1"; - mountOptions = [ "X-mount.mkdir" "umask=0077" ]; - extraArgs = [ "-nESP1" ]; - }; - }; - swap = { - size = "16G"; - type = "8200"; - content = { - type = "swap"; - extraArgs = [ "-L swap" ]; - }; - }; - zfs = { - size = "100%"; - content = { - type = "zfs"; - pool = "rpool"; - }; - }; - }; - }; - }; - }; - zpool = { - rpool = { - type = "zpool"; - rootFsOptions = { - acltype = "posixacl"; - canmount = "off"; - compression = "on"; - dnodesize = "auto"; - relatime = "on"; - xattr = "sa"; - }; - options = { - ashift = "12"; - autotrim = "on"; - }; - datasets = { - "local" = { - type = "zfs_fs"; - options.mountpoint = "none"; - }; - "local/root" = { - type = "zfs_fs"; - options.mountpoint = "legacy"; - mountpoint = "/"; - }; - "local/nix" = { - type = "zfs_fs"; - options = { - atime = "off"; - mountpoint = "legacy"; - }; - mountpoint = "/nix"; - }; - "user" = { - type = "zfs_fs"; - options.mountpoint = "none"; - }; - "user/home" = { - type = "zfs_fs"; - options.mountpoint = "legacy"; - mountpoint = "/home"; - }; - "user/home/root" = { - type = "zfs_fs"; - options.mountpoint = "legacy"; - mountpoint = "/root"; - }; - "user/home/nipsy" = { - type = "zfs_fs"; - options.mountpoint = "legacy"; - mountpoint = "/home/nipsy"; - }; - "user/home/trent" = { - type = "zfs_fs"; - options.mountpoint = "legacy"; - mountpoint = "/home/trent"; - }; - }; - }; - }; - }; -} diff --git a/hosts/prometheus/hardware-configuration.nix b/hosts/prometheus/hardware-configuration.nix deleted file mode 100644 index c0e8417..0000000 --- a/hosts/prometheus/hardware-configuration.nix +++ /dev/null @@ -1,41 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ #(modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - extraModulePackages = [ ]; - initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - initrd.kernelModules = [ ]; - kernelModules = [ "kvm-intel" "ntsync" ]; - }; - - #nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - hardware = { - bluetooth.enable = true; - cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - graphics = { - enable = true; - enable32Bit = true; - extraPackages = [ pkgs.nvidia-vaapi-driver ]; - extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; - }; - - nvidia = let - betaPkg = config.boot.kernelPackages.nvidiaPackages.beta; - pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg; - finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc; - in { - modesetting.enable = true; - open = true; - package = if finalPkg == betaPkg then betaPkg else finalPkg; - }; - }; -} |