flake.lock

@@ -122,11 +122,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696737557,
+        "lastModified": 1696446489,
-        "narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=",
+        "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d",
+        "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1696666273,
+        "lastModified": 1695227806,
-        "narHash": "sha256-hpqcq42oFtQvDst5Rup9U/ejZgTnAJum0+nSgsBQ8Gs=",
+        "narHash": "sha256-EcChzeEOh2oAZNgvR+kWCBpWomMopK2Zs+0+dvDUJh0=",
         "owner": "kmonad",
         "repo": "kmonad",
-        "rev": "8440eafdb516a379b4350f3c29a0e919f88cee24",
+        "rev": "22da3354e6f629f9294c830d8558875d77b5cffc",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1696788931,
+        "lastModified": 1696524703,
-        "narHash": "sha256-E19130KVEQaWgP7Wcg/npw/Sd9H+jN0lCP97nn0JNUo=",
+        "narHash": "sha256-KqzFNzhq0GpT09h1w2r2h7NxYvxDnzU3qOWYbfbAqyw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aca9a453afe59a291298957090b79398deaccb2b",
+        "rev": "ef8e9997fcb37d5c8372dc1349185bd0d31752a6",
         "type": "github"
       },
       "original": {
@@ -256,11 +256,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1696604326,
+        "lastModified": 1696193975,
-        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
+        "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
+        "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
         "type": "github"
       },
       "original": {
@@ -294,11 +294,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1696593451,
+        "lastModified": 1696533984,
-        "narHash": "sha256-NzEGb281LkgQ5/hYd0zQu3bIqiLE24Zo1A26SbDMlFU=",
+        "narHash": "sha256-4B7UpA9L8t57RYg801HopuEiipQJKzkEcLgPUaOB5Uw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "eb84003a09ade3812b6bfe0d0804249f1847abab",
+        "rev": "a0c35acab596530208034aef2e254cf32179268b",
         "type": "github"
       },
       "original": {

hosts/Alaska/default.nix

@@ -5,7 +5,6 @@
 {
   imports = [ 
     (import ./hardware-configuration.nix)
-    (import ./modules/dnsmasq.nix)
     (import ./modules/forgejo.nix)
     (import ./modules/nginx.nix)
     (import ./modules/nextcloud.nix)

hosts/Alaska/modules/dnsmasq.nix

@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ...}:
-
-{
-
-  networking.firewall = {
-    allowedTCPPorts = [53];
-    allowedUDPPorts = [53];
-  };
-  services.dnsmasq = {
-    enable = true;
-    alwaysKeepRunning = true;
-    resolveLocalQueries = true;
-    settings = {
-      listen-address = "::1,127.0.0.1,10.0.0.183";
-      port = 53;
-      server = [ "1.1.1.1" "8.8.8.8" "8.8.4.4" ];
-      # Manual expection for frustrating windows devices to point at headscale server
-      address = "/headscale.nickiel.net/10.0.0.183";
-      bogus-priv = true;
-      domain-needed = true;
-      no-resolv = true;
-      cache-size = 1000;
-    };
-  };
-}

hosts/Alaska/modules/tailscale.nix

@@ -3,9 +3,8 @@
 {
   # to add a new headscale "user", run this command
   # sudo headscale users create elnuhub
-  # then run this command where headscale_url is the https path 
+  # then run this command where headscale_url is the http path 
   # to the server
-  ## NOTE: Must Include the HTTPS://
   # tailscale up --login-server <headscale_url>
   # then replace USERNAME with the computer's hostname which you created
   # an "user" account in the first comment

hosts/desktop/default.nix

@@ -3,35 +3,20 @@
 
 {
   imports = [
-    (import ./../../modules/xrdp.nix)
 	./hardware-configuration.nix
   ];
 
-  networking = {
+  networking.hosts = {
-    firewall = {
+    "10.0.0.183" = [ "headscale.nickiel.net" ];
+    "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ];
+  };
+  services.tailscale.enable = true;
+  networking.firewall = {
     checkReversePath = "loose";
     trustedInterfaces = [ "tailscale0" ];
     allowedUDPPorts = [ config.services.tailscale.port ];
   };
 
-    nameservers = ["10.0.0.183" "1.1.1.1"];
-
-    hosts = {
-      # "10.0.0.183" = [ "headscale.nickiel.net" ];
-      "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ];
-    };
-  };
-  services = {
-    tailscale.enable = true;
-    sshd.enable = true;
-    openssh.settings = {
-      PasswordAuthentication = false;
-      PermitRootLogin = "no";
-      X11Forwarding = true;
-    };
-  };
-  systemd.services.sshd.wantedBy = [ "multi-user.target" ];
-
   
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.opengl.enable = true;

hosts/laptop/default.nix

@@ -1,14 +1,13 @@
 { config, ... }:
 
 { imports = [
-    (import ./../../modules/xrdp.nix)
 	./hardware-configuration.nix
   ];
 
   hardware.bluetooth.enable = true;
 
   networking.hosts = { 
-    "10.0.0.183" = [ "headscale.nickiel.net" ]; 
+    #"10.0.0.183" = [ "headscale.nickiel.net" ]; 
     "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" 
     "jellyfin.nickiel.net" ];
   };
@@ -19,6 +18,7 @@
   };
   time.hardwareClockInLocalTime = true;
 
+
   boot.loader = { efi = {
       canTouchEfiVariables = true; efiSysMountPoint = "/boot";
     };

modules/neovim.nix

@@ -29,122 +29,43 @@ in
       tabstop = 4;
     };
 
-    keymaps = [
+    # https://github.com/pupbrained/nix-config/blob/29af4835f21940af51b86313c451fb572a29874a/pkgs/nixvim.nix#L8
-      # Modes: https://superuser.com/questions/1702308/how-can-i-configure-shortcut-keys-in-all-modes-of-vim
+    maps.normal = {
-      # n - normal
+      "<leader>ot" = "<cmd>vs | te<cr>";
-      # i - insert
+      "<leader>op" = "<cmd>NvimTreeToggle<cr>";
-      # c - cmd
+      "<leader>o." = "<cmd>Telescope file_browser<cr>";
-      # v - visual select 
+      "<leader>."  = "<cmd>Telescope find_files<cr>"; # cwd full sub-dir fuzzy find
-      # x - visual only 
+      "<leader>of" = "<cmd>Telescope live_grep<cr>"; # cwd search file
-      # s - selection 
-      # o - oper 
-      # t - terminal 
-      # l - lang
-      {
-        # Open new vertical split and starts a new terminal window
-        mode = "n";
-        key = "<leader>ot";
-        action = "<cmd>vs | te<cr>";
-      }
-      {
-        # toggle the left tree panel
-        mode = "n";
-        key = "<leader>op";
-        action = "<cmd>NvimTreeToggle<cr>";
-      }
-      {
-        # Open cwd filename fuzzy search
-        mode = "n";
-        key = "<leader>o.";
-        action = "<cmd>Telescope file_browser<cr>";
-      }
-      {
-        # Open fuzzy filename recursive search 
-        mode = "n";
-        key = "<leader>.";
-        action = "<cmd>Telescope find_files<cr>";
-      }
-      {
-        # Search file contents of cwd
-        mode = "n";
-        key = "<leader>of";
-        action = "<cmd>Telescope live_grep<cr>";
-      }
-      {
-        # Keep cursor centered while navigating
-        mode = "n";
-        key = "<C-d>";
-        action = "<C-d>zz";
-      }
-      {
-        # Keep cursor centered while navigating
-        mode = "n";
-        key = "<C-u>";
-        action = "<C-u>zz";
-      }
-      {
-        # Keep cursor centered while skipping to search results
-        mode = "n";
-        key = "n";
-        action = "nzzzv";
-      }
-      {
-        # Keep cursor centered while skipping to search results
-        mode = "n";
-        key = "N";
-        action = "Nzzzv";
-      }
-      {
-        # Yank to system clipboard
-        mode = "n";
-        key = "<leader>y";
-        action = "\"+y";
-      }
-      {
-        # Yank to system clipboard
-        mode = "n";
-        key = "<leader>Y";
-        action = "\"+Y";
-      }
-      {
-        # Delete into the void
-        mode = "n";
-        key = "<leader>d";
-        action = "\"_d";
-      }
 
-      {
+      # keep cursor centered while navigating
-        # Move visual selection up one row
+      "<C-d>" = "<C-d>zz";
-        mode = "v";
+      "<C-u>" = "<C-u>zz";
-        key = "J";
+      "n" = "nzzzv";
-        action = ":m '>+1<CR>gv=gv";
+      "N" = "Nzzzv"; 
-      }
-      {
-        # Move visual selection down one row
-        mode = "v";
-        key = "K";
-        action = ":m '<-2<CR>gv=gv";
-      }
-      {
-        # Yank selection to system clipboard
-        mode = "v";
-        key = "<leader>y";
-        action = "\"+y";
-      }
-      {
-        # Delete selection into void
-        mode = "v";
-        key = "<leader>d";
-        action = "\"_d";
-      }
 
-      {
+      # yank to system clipboard
-        # leader+p delete the selection to the void, then paste
+      "<leader>y" = "\"+y";
-        mode = "x";
+      "<leader>Y" = "\"+Y";
-        key = "<leader>p";
+
-        action = "\"_dP"; 
+      # perma-delete without putting on any clipboard
-      }
+      "<leader>d" = "\"_d";
-    ];
+    };
+
+    maps.visual = {
+      # moves visual selection up and down lines
+      "J" = ":m '>+1<CR>gv=gv";
+      "K" = ":m '<-2<CR>gv=gv"; 
+
+      # copy to system clipboard
+      "<leader>y" = "\"+y";
+
+      # perma-delete without putting on any clipboard
+      "<leader>d" = "\"_d";
+    };
+
+    maps.visualOnly = {
+      "<leader>p" = "\"_dP"; # leader+p deletes the selection to null, then pastes
+    };
 
     plugins = {
 

modules/xrdp.nix

@@ -1,9 +0,0 @@
-{config, lib, pkgs, ...}:
-
-{
-  services.xrdp = {
-    enable = true;
-    defaultWindowManager = "startplasma-x11";
-    openFirewall = true;
-  };
-}

rsrcs/.p10k.zsh

@@ -1621,7 +1621,7 @@
   # Show battery in yellow when it's discharging.
   typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=3
   # Battery pictograms going from low to high level of charge.
-  typeset -g POWERLEVEL9K_BATTERY_STAGES='\uf008e\uf007a\uf007b\uf007c\uf007d\uf007e\uf007f\uf0080\uf0081\uf0082\uf0079'
+  typeset -g POWERLEVEL9K_BATTERY_STAGES='\uf58d\uf579\uf57a\uf57b\uf57c\uf57d\uf57e\uf57f\uf580\uf581\uf578'
   # Don't show the remaining time to charge/discharge.
   typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false
   typeset -g POWERLEVEL9K_BATTERY_BACKGROUND=236

users/nixolas.nix

@@ -107,7 +107,6 @@ in
       pkgs-stable.darktable # RAW processing
       pkgs-stable.dbeaver   # SQL management tool
       firefox   # Internet access
-                  freerdp   # RDP client
       pkgs-stable.inkscape  # Vector drawing
       pkgs-stable.kicad     # PCB design
       krita     # Raster drawing