flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733484277,
+        "lastModified": 1730837930,
-        "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
+        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
+        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733392399,
+        "lastModified": 1730785428,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
         "type": "github"
       },
       "original": {

hosts/default/configuration.nix

@@ -2,12 +2,6 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-# New TODO: 
-# - investigate tmux-session-wizard, and tpm
-# - see if zoxide can import .z file (from z.sh)
-# - so far, have added aliases and bashrc directly, along with bin folder and ssh setup.
-# - aaaaaah! so much
-
 { config, pkgs, inputs, ... }:
 
 {
@@ -18,37 +12,26 @@
       ./main-user.nix
     ];
 
-  #fileSystems."/mnt/arch" =
+  #fileSystems."/mnt" =
   #  { device = "/dev/disk/by-uuid/72db20ba-4dbd-4fb7-891c-b457e2cf9648";
   #    fsType = "btrfs";
   #    options = [ "subvol=5" ];
   #  };
-  #fileSystems."/mnt/arch/home" =
+
+  #fileSystems."/mnt/home" =
   #  { device = "/dev/disk/by-uuid/4eda05c2-d434-495d-97a0-8a81e8a533ec";
   #    fsType = "btrfs";
   #    options = [ "subvol=5" ];
   #  };
-  #fileSystems."/mnt/bulk" =
+  boot.initrd.luks.devices."nvme0n1p2_crypt".device = "/dev/disk/by-uuid/93922f23-d0ba-4405-adbb-9789d37e5985";
-  #  { device = "/dev/disk/by-uuid/xxxx";
-  #    fsType = "ext4";
-  #  };
-  #fileSystems."/mnt/slow" =
-  #  { device = "/dev/disk/by-uuid/xxxx";
-  #    fsType = "etx4";
-  #  };
   boot.initrd.luks.devices."nvme2n1p2_oldcrypt".device = "/dev/disk/by-uuid/44235dca-99e8-4ea8-9516-97d9f5a2d702";
-  boot.kernelModules = [ "kvm-amd" "nct6775" ];
+
-  
+
-  services.fwupd.enable = true;
-  services.hardware.openrgb.enable = true;
   # Add flakes
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   # Feel like I should be sure this is safe w/flakes first:
   #system.autoUpgrade.enable = true;
-  # sets up things so envs can do shebang whatever
-  # instead of #!/usr/bin/env whatever
-  #services.envfs.enable = true;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -99,8 +82,6 @@
   #};
 
   # Enable CUPS to print documents.
-  # ...no. Recent security issues, prefer disabled
-  # apps like e.g. LibreOffice can still generate pdf's (e.g. to stand in [generally] for Print to pdf)
   # services.printing.enable = true;
 
   # Enable sound with pipewire.
@@ -122,7 +103,6 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  # Note that extraGroups overrides the module defaults entirely (they don't merge...probably a lib.* thing for that?)
   # Pull defaults from main-user:
   main-user.enable = true;
   main-user.userName = "wolcen";
@@ -130,7 +110,7 @@
   users.users.wolcen = {
     description = "Chris Thompson";
     openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEdxdKYrlwOolJpYxvWu6gW/60pzT6aKN6JHhnTSBFqN wolcen@typhoon" ];
-    extraGroups = [ "networkmanager" "wheel" "docker" "dialout" ];
+    extraGroups = [ "networkmanager" "wheel" ];
   };
 
   home-manager = {
@@ -145,91 +125,31 @@
   # Add docker!
   virtualisation.docker.enable = true;
   virtualisation.docker.storageDriver = "btrfs"; # Only when using BTRFS! (wolcen approved!)
-
+  # Required for DDEV to add hosts files, if your DNS will not resolve addresses to localhost. 
-  # Required for DDEV to add hosts files, if your DNS will not resolve addresses to localhost.
+  environment.etc.hosts.mode = "0644";
-  # Some firewall DNS resolvers will NOT allow an externally resolved domain name to resolve to a reserved IP (e.g. localhost).
-  # This is a security protection method that can assist attackers with discovery of a LAN.
-  # With fpSense, you can tell unbound (or dnsmasq) to resolve *.ddev.site to 127.0.0.1 and remove this mode statement
-  # See https://docs.netgate.com/pfsense/en/latest/services/dns/wildcards.html
-  # environment.etc.hosts.mode = "0644";
-
-  # For xdebug...verify actual necessity
-  # Have had to use this, but I think it can be disabled still - perhaps w/xdebug binding setting...don't know.
-  networking.firewall.allowedTCPPorts = [ 9003 ];
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    neovim # next gen vim w/lua
+    neovim
-    wget # url fetcher/spider
+    wget
-    curl # url fetcher
+    curl
-    tmux # terminal multiplexer
+    tmux
-    whois # net ip/dns lookup
+    whois
-    meld # file diff'r
+    git
-    wl-clipboard-rs # rust implementation of wayland clipboard cli
+    wl-clipboard-rs
-    dogdns # a better dig cmd
+    dogdns
-    bat # a better cat command
+    bat
-    nix-search-cli # search the nix repo
+    nix-search-cli
-    lsof # show open file handles
+    lsof
-    eza # a better ls
-    lm_sensors # hardware monitoring (e.g. temps)
-    btop # cli sys monitor
-    amdgpu_top # top-like monitor for AMD GPUs
-    direnv # autoload .envrc files
-    zoxide # directory navigator (z)
-    nextcloud-client # next cloud UI
-    file # show file types
-    tldr # cli command summary
-    stress # system workload generator
-    dmidecode # system settings provider (e.g. bios)
-    jq # json query
-    niv # dependency cli for nix-shell
-    openrgb-with-all-plugins # colors hardware control
-    just # command runner like make
-    #ansible # configuration management system/automation tool
-    kdePackages.kcachegrind # analyze xdebug output
-    libreoffice-qt # libreoffice - qt is best for KDE
-    hunspell # spell checking
-    hunspellDicts.en_US # spell check dictionary
-    #corectl # this doesn't exist????
-    magic-wormhole # transfer files with ease
-    screen # terminal multiplexer...from GNU
-    gnumake # build automation tool
-    #git-open # open the url of the project in web
-    diffr # another diff hilighting tool
-    brave # privacy oriented browser
-    zig # the zig language
   ];
-  programs.git = {
+
-    enable = true;
-    lfs.enable = true;
-  };
-  # Orchestrator for FOSS VR stack
-  #programs.envision = {
-  #  enable = true;
-  #  openFirewall = true; # This is set true by default
-  #};
   nixpkgs.config.permittedInsecurePackages = [
     "electron-27.3.11"
   ];
 
-  #fonts = {
-  #  fontconfig.enable = true;
-  #  enableFontDir = true;
-  #  enableGhostscriptFonts = true;
-  #  fonts = with pkgs; [
-  #    corefonts
-  #    dejavu_fonts
-  #    inconsolata
-  #    source-han-sans-japanese
-  #    source-han-sans-korean
-  #    source-han-sans-simplified-chinese
-  #    source-han-sans-traditional-chinese
-  #    ubuntu_font_family
-  #  ];
-  #};
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -242,9 +162,6 @@
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.openssh.ports = [ 2112 ]; # must be a list...for some reason.
-  # Enable mobile shell (for roaming, intermittent connectivity, etc)
-  programs.mosh.enable = true;
 
   # RX 6700 XT setup
   hardware.graphics.extraPackages = [
@@ -270,19 +187,9 @@
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
   };
-  # VR
+
-  #Commmand: `renice -20 -p $(pgrep monado)` may help w/issues
+  programs.java.enable = true;
-  services.monado = {
+  programs.steam.package = pkgs.steam.override { withJava = true; };
-    enable = true;
-    defaultRuntime = true; # Register as default OpenXR runtime
-    #environment.WMR_HANDTRACKING = "1"; # Enable for hand tracking
-    #environment.U_PACING_COMP_MIN_TIME_MS = "5"; # This is a tweak for something...I forgot
-  };
-  # allow clock adjustments/priority change, etc (gamemoderun ./game)
-  # https://wiki.nixos.org/wiki/GameMode
-  programs.gamemode.enable = true; # for performance mode
-  #programs.java.enable = true;
-  #programs.steam.package = pkgs.steam.override { withJava = true; };
 
   programs.steam.gamescopeSession.enable = true;
 
@@ -301,4 +208,3 @@
   system.stateVersion = "24.05"; # Did you read the comment?
 
 }
-

hosts/default/main-user.nix

@@ -19,37 +19,17 @@ in
       isNormalUser = true;
       initialPassword = "B@dC0d3MangFIX|T";
       description = lib.mkDefault "Just a normal admin";
-      # groups: wheel => sudo access, dialout => serial access
       extraGroups = [ "wheel" "networkmanager" "docker" ];
       packages = with pkgs; [
-        #kdePackages.kate # ... why did I add this?
+        kdePackages.kate
-        thunderbird # email client
+        thunderbird
-        keepassxc # passwords!
+        keepassxc
-        macchina # like *fetch - display basics
+        macchina
-        z-lua # jump around directories (be careful with same-named ones!)
+        z-lua
         logseq # REQUIRES TEMPORARY INSECURE ELECTRON
-        signal-desktop # messaging
+        signal-desktop
-        ddev # local docker dev awesome
+        ddev
-        vscodium # vs code editor, but free
+        vscodium
-        # go to 2.17 when no more servers w/python issues (elizabeth)
-        ansible_2_16 # deployment/automation
-        #python311Full # troubleshooting ansible things.
-        #python311Packages.ansible
-        # php added for ansible composer build temporarily
-        # switch to an ansible build environment instead.
-        php81
-        php81Packages.composer
-        php81Packages.composer
-        php81Extensions.zip
-        php81Extensions.xml
-        php81Extensions.dom
-        php81Extensions.bz2
-        php81Extensions.yaml
-        php81Extensions.zlib
-        php81Extensions.zstd
-        php81Extensions.intl
-        php81Extensions.curl
-        php81Extensions.posix
       ];
     };
   };