hosts/zedd/configuration.nix

@@ -3,8 +3,7 @@
   # Enable OpenGL
   # Load nvidia driver for Xorg and Wayland
   environment.pathsToLink = [ "/libexec" ];
-  users.users.mbeno.extraGroups = [ "adbusers" ];
+
-  programs.adb.enable = true;
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

system/programs.nix

@@ -42,10 +42,7 @@
     pass
     xdg-desktop-portal
     pkg-config
-    xclip
-    nvd
     xdg-desktop-portal-gtk
-    google-chrome
     zoom-us
     neovim
     git

system/services.nix

@@ -5,41 +5,6 @@
   networking.firewall.enable = false;
   security.polkit.enable = true;
   services = {
-    prometheus = {
-      scrapeConfigs = [
-        {
-          job_name = "chrysalis";
-          static_configs = [{
-            targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ];
-          }];
-        }
-      ];
-
-      exporters = {
-        node = {
-          enable = true;
-          enabledCollectors = [ "systemd" "processes" ];
-          port = 9002;
-        };
-      };
-
-      enable = true;
-      port = 9001;
-    };
-
-    grafana = {
-      enable = true;
-      settings = {
-        server = {
-          # Listening Address
-          http_addr = "127.0.0.1";
-          # and Port
-          http_port = 3000;
-          # Grafana needs to know on which domain and URL it's running
-          serve_from_sub_path = true;
-        };
-      };
-    };
     displayManager =
       {
         defaultSession = "none+i3";
@@ -50,9 +15,8 @@
     logind.extraConfig = "IdleAction=ignore";
     xserver = {
       enable = true;
-      xkb.layout = "us,no";
+      xkb.layout = "us";
-      xkb.variant = "qwerty";
+      xkb.variant = "";
-      xkb.options = "grp:win_space_toggle";
       desktopManager = {
         xterm.enable = false;
       };

user/default.nix

@@ -16,6 +16,7 @@
         ./programs/obs-studio
         ./programs/vscode
         ./programs/games
+        ./programs/questpatcher
         ./scripts
         ./zsh
         ./packages

user/packages/default.nix

@@ -4,14 +4,7 @@
     inputs.nix-citizen.packages.${system}.star-citizen
     age
     discord
-    pdfpc
-    qpwgraph
-    mixxx
-    imagemagick
-    maim
     sidequest
-    opera
-    android-studio
     libpng
     p7zip
     lshw

user/zsh/default.nix

@@ -1,4 +1,4 @@
-{ user, pkgs, config, ... }: {
+{ user, pkgs, ... }: {
   home.packages = with pkgs; [ fd ];
   programs.zsh = {
     enable = true;
@@ -7,17 +7,7 @@
     enableCompletion = true;
     syntaxHighlighting.enable = true;
     shellAliases = {
-      nrebuild = "sudo nixos-rebuild switch --flake /home/${user}/git/nixos && nvd diff $(ls -d1v /nix/var/nix/profiles/system-*-link|tail -n 2) && source ~/.zshrc";
+      nrebuild = "sudo nixos-rebuild switch --flake /home/${user}/git/nixos";
-      nlog = ''
-        revpath="/nix/var/nix/profiles";
-        lastrev=$(ls -d1v $revpath/system-*-link|cut -d "-" -f2 | tail -n1);
-        for revit in {$lastrev..0};
-        do 
-          ls -lt $revpath/system-$revit-link $revpath/system-$(( $revit - 1 ))-link | cut -d" " -f6,7,8 | awk '{key=$0; getline; print key " -> " $0;}'
-          nvd diff $revpath/system-$revit-link $revpath/system-$(( $revit - 1 ))-link;
-          read;
-        done
-      '';
       dresden = "/home/mbeno/.ssh/dresden.sh";
       d = "dresden";
     };
@@ -25,8 +15,6 @@
     initExtra = ''
       bindkey -v
       bindkey '^R' history-incremental-search-backward
-      bindkey '^[[A' history-substring-search-up
-      bindkey '^[[B' history-substring-search-down
 
       # Prompt stuff
       autoload -Uz promptinit
@@ -37,16 +25,9 @@
     zplug = {
       enable = true;
       plugins = [
-        { name = "plugins/git"; tags = [ "from:oh-my-zsh" ]; }
+        ({ name = "plugins/git"; tags = [ "from:oh-my-zsh" ]; })
-        { name = "modules/prompt"; tags = [ "from:prezto" ]; }
+        ({ name = "modules/prompt"; tags = [ "from:prezto" ]; })
-        { name = "zsh-users/zsh-autosuggestions"; }
-        {
-          name =
-            "zsh-users/zsh-history-substring-search";
-        }
       ];
     };
-    history.size = 1000000;
-    history.path = "${config.xdg.dataHome}/zsh/history";
   };
 }