From 241370064ef6ca666c93ae8e683f2f952f076988 Mon Sep 17 00:00:00 2001
From: 4o1x5 <4o1x5@4o1x5.dev>
Date: Sat, 18 May 2024 01:10:04 +0200
Subject: [PATCH] added a few changes

---
 {nixos => etc}/apps/communication.nix         |   1 +
 {nixos => etc}/apps/keepassxc.nix             |   0
 {nixos => etc}/apps/music.nix                 |   0
 {nixos => etc}/apps/office.nix                |   0
 {nixos => etc}/apps/prod.nix                  |   2 +
 {nixos => etc}/apps/syncthing.nix             |   0
 {nixos => etc}/configs/alacritty.nix          |   0
 {nixos => etc}/configs/btop.nix               |   0
 {nixos => etc}/configs/colors.nix             |   0
 {nixos => etc}/configs/firefox.nix            |   0
 .../configs/gpu-screen-recorder.nix           |   0
 {nixos => etc}/configs/i3.nix                 |  13 ++-
 {nixos => etc}/configs/kitty.nix              |   0
 {nixos => etc}/configs/ollama.nix             |   0
 {nixos => etc}/configs/picom.nix              |   4 +
 {nixos => etc}/configs/polybar.nix            |  41 ++++---
 etc/configs/prometheus.nix                    |   8 ++
 {nixos => etc}/configs/rofi.nix               |   1 +
 {nixos => etc}/configs/st.nix                 |   0
 {nixos => etc}/configs/vscode.nix             |  11 ++
 {nixos => etc}/configuration.nix              |   8 +-
 {nixos => etc}/desktop.nix                    |   8 +-
 {nixos => etc}/dev.nix                        |   4 +-
 {nixos => etc}/flake.lock                     | 110 ++++++++++++++++--
 {nixos => etc}/flake.nix                      |   7 +-
 {nixos => etc}/gaming.nix                     |   0
 etc/hardware-configuration.nix                |  47 ++++++++
 etc/opt/firefox/bookmarks.nix                 |  29 +++++
 {nixos => etc}/opt/firefox/user.js            |   0
 {nixos => etc}/opt/firefox/userChrome.css     |   0
 {nixos => etc}/opt/firefox/userContent.css    |   0
 {nixos => etc}/opt/st/st.h                    |   0
 {nixos => etc}/system/cursor.nix              |   0
 {nixos => etc}/system/display.nix             |   0
 .../system/drivers/shitvidia-patch.nix        |   2 +-
 {nixos => etc}/system/essentials.nix          |   1 +
 {nixos => etc}/system/remap.nix               |   0
 {nixos => etc}/system/security.nix            |   0
 {nixos => etc}/system/shell.nix               |  25 +++-
 {nixos => etc}/system/sound.nix               |   0
 etc/system/ssd.nix                            |  17 +++
 nixos/apps/firefox.nix                        |   1 -
 readme.md                                     |  39 +++++++
 43 files changed, 344 insertions(+), 35 deletions(-)
 rename {nixos => etc}/apps/communication.nix (92%)
 rename {nixos => etc}/apps/keepassxc.nix (100%)
 rename {nixos => etc}/apps/music.nix (100%)
 rename {nixos => etc}/apps/office.nix (100%)
 rename {nixos => etc}/apps/prod.nix (98%)
 rename {nixos => etc}/apps/syncthing.nix (100%)
 rename {nixos => etc}/configs/alacritty.nix (100%)
 rename {nixos => etc}/configs/btop.nix (100%)
 rename {nixos => etc}/configs/colors.nix (100%)
 rename {nixos => etc}/configs/firefox.nix (100%)
 rename {nixos => etc}/configs/gpu-screen-recorder.nix (100%)
 rename {nixos => etc}/configs/i3.nix (92%)
 rename {nixos => etc}/configs/kitty.nix (100%)
 rename {nixos => etc}/configs/ollama.nix (100%)
 rename {nixos => etc}/configs/picom.nix (93%)
 rename {nixos => etc}/configs/polybar.nix (84%)
 create mode 100644 etc/configs/prometheus.nix
 rename {nixos => etc}/configs/rofi.nix (81%)
 rename {nixos => etc}/configs/st.nix (100%)
 rename {nixos => etc}/configs/vscode.nix (80%)
 rename {nixos => etc}/configuration.nix (95%)
 rename {nixos => etc}/desktop.nix (93%)
 rename {nixos => etc}/dev.nix (95%)
 rename {nixos => etc}/flake.lock (55%)
 rename {nixos => etc}/flake.nix (88%)
 rename {nixos => etc}/gaming.nix (100%)
 create mode 100755 etc/hardware-configuration.nix
 create mode 100755 etc/opt/firefox/bookmarks.nix
 rename {nixos => etc}/opt/firefox/user.js (100%)
 rename {nixos => etc}/opt/firefox/userChrome.css (100%)
 rename {nixos => etc}/opt/firefox/userContent.css (100%)
 rename {nixos => etc}/opt/st/st.h (100%)
 rename {nixos => etc}/system/cursor.nix (100%)
 rename {nixos => etc}/system/display.nix (100%)
 rename {nixos => etc}/system/drivers/shitvidia-patch.nix (93%)
 rename {nixos => etc}/system/essentials.nix (99%)
 rename {nixos => etc}/system/remap.nix (100%)
 rename {nixos => etc}/system/security.nix (100%)
 rename {nixos => etc}/system/shell.nix (56%)
 rename {nixos => etc}/system/sound.nix (100%)
 create mode 100644 etc/system/ssd.nix
 delete mode 100755 nixos/apps/firefox.nix

diff --git a/nixos/apps/communication.nix b/etc/apps/communication.nix
similarity index 92%
rename from nixos/apps/communication.nix
rename to etc/apps/communication.nix
index 56da289..e4e64b8 100755
--- a/nixos/apps/communication.nix
+++ b/etc/apps/communication.nix
@@ -7,6 +7,7 @@
     mumble # voip
     element-desktop # fully featured matrix client
     #gomuks # tui matrix client
+    cinny-desktop
   ];
 
 
diff --git a/nixos/apps/keepassxc.nix b/etc/apps/keepassxc.nix
similarity index 100%
rename from nixos/apps/keepassxc.nix
rename to etc/apps/keepassxc.nix
diff --git a/nixos/apps/music.nix b/etc/apps/music.nix
similarity index 100%
rename from nixos/apps/music.nix
rename to etc/apps/music.nix
diff --git a/nixos/apps/office.nix b/etc/apps/office.nix
similarity index 100%
rename from nixos/apps/office.nix
rename to etc/apps/office.nix
diff --git a/nixos/apps/prod.nix b/etc/apps/prod.nix
similarity index 98%
rename from nixos/apps/prod.nix
rename to etc/apps/prod.nix
index bd42887..02f92ce 100755
--- a/nixos/apps/prod.nix
+++ b/etc/apps/prod.nix
@@ -3,7 +3,9 @@
     taskwarrior
     timewarrior
     logseq
+
   ];
+
 }
 
 
diff --git a/nixos/apps/syncthing.nix b/etc/apps/syncthing.nix
similarity index 100%
rename from nixos/apps/syncthing.nix
rename to etc/apps/syncthing.nix
diff --git a/nixos/configs/alacritty.nix b/etc/configs/alacritty.nix
similarity index 100%
rename from nixos/configs/alacritty.nix
rename to etc/configs/alacritty.nix
diff --git a/nixos/configs/btop.nix b/etc/configs/btop.nix
similarity index 100%
rename from nixos/configs/btop.nix
rename to etc/configs/btop.nix
diff --git a/nixos/configs/colors.nix b/etc/configs/colors.nix
similarity index 100%
rename from nixos/configs/colors.nix
rename to etc/configs/colors.nix
diff --git a/nixos/configs/firefox.nix b/etc/configs/firefox.nix
similarity index 100%
rename from nixos/configs/firefox.nix
rename to etc/configs/firefox.nix
diff --git a/nixos/configs/gpu-screen-recorder.nix b/etc/configs/gpu-screen-recorder.nix
similarity index 100%
rename from nixos/configs/gpu-screen-recorder.nix
rename to etc/configs/gpu-screen-recorder.nix
diff --git a/nixos/configs/i3.nix b/etc/configs/i3.nix
similarity index 92%
rename from nixos/configs/i3.nix
rename to etc/configs/i3.nix
index 53f51b2..e18ccc1 100755
--- a/nixos/configs/i3.nix
+++ b/etc/configs/i3.nix
@@ -1,6 +1,10 @@
 { pkgs, lib, ... }: {
 
-
+  environment.systemPackages = with pkgs; [
+    # for replay 
+    xdotool
+    jq
+  ];
   home-manager.users.grape.xsession.windowManager.i3 = {
     enable = true;
     config = {
@@ -51,7 +55,6 @@
             "mod4+e" = "exec rofi -show calc";
             "mod4+t" = "exec alacritty";
             "mod4+r" = "exec firefox";
-            "mod4+w" = "exec ~/.config/scripts/save_replay.sh";
 
             # power off
             "mod4+Shift+Delete" = "exec shutdown now";
@@ -60,6 +63,12 @@
             "mod4+1" = "exec setxkbmap us";
             "mod4+2" = "exec setxkbmap hu";
 
+            # replay
+            "mod4+s" = "exec ~/.config/scripts/replay_application_name.sh";
+            "mod4+w" = "exec ~/.config/scripts/save_replay.sh";
+            "mod4+a" = "exec ~/.config/scripts/start_replay.sh";
+            "mod4+x" = "exec ~/.config/scripts/stop_replay.sh";
+
             # screenshot
             # shit needs work
             "Print" = "exec scrot '%Y-%m-%d_%H-%M-%S.png' -e 'mv $f ~/Pictures/screenshots && xclip -selection clipboard -t image/png -i ~/Pictures/screenshots/$f'";
diff --git a/nixos/configs/kitty.nix b/etc/configs/kitty.nix
similarity index 100%
rename from nixos/configs/kitty.nix
rename to etc/configs/kitty.nix
diff --git a/nixos/configs/ollama.nix b/etc/configs/ollama.nix
similarity index 100%
rename from nixos/configs/ollama.nix
rename to etc/configs/ollama.nix
diff --git a/nixos/configs/picom.nix b/etc/configs/picom.nix
similarity index 93%
rename from nixos/configs/picom.nix
rename to etc/configs/picom.nix
index daad8b2..943866a 100755
--- a/nixos/configs/picom.nix
+++ b/etc/configs/picom.nix
@@ -27,6 +27,10 @@
         "window_type = 'desktop'"
         "_GTK_FRAME_EXTENTS@:c"
         "class_g ~= 'slop'"
+        "class_g ~= 'Warframe.x64.exe'"
+        "class_g ~= 'Warframe.x64.ex'"
+        "class_g ~= 'Warframe'"
+        "class_g ~= 'Peek'"
       ];
 
       opacity-rule = [
diff --git a/nixos/configs/polybar.nix b/etc/configs/polybar.nix
similarity index 84%
rename from nixos/configs/polybar.nix
rename to etc/configs/polybar.nix
index 6e04186..921516e 100755
--- a/nixos/configs/polybar.nix
+++ b/etc/configs/polybar.nix
@@ -38,21 +38,12 @@ in
         label = " | ";
         label-foreground = "${colors.seperatorColor}";
       };
-      "module/cpu-label" = {
-        type = "custom/text";
-        label = "CPU ";
-        label-foreground = "${colors.seperatorColor}";
-      };
       "module/gpu-label" = {
         type = "custom/text";
         label = "GPU ";
         label-foreground = "${colors.seperatorColor}";
       };
-      "module/ram-label" = {
-        type = "custom/text";
-        label = "RAM ";
-        label-foreground = "${colors.seperatorColor}";
-      };
+
       "module/replay-label" = {
         type = "custom/text";
         label = "REPLAY ";
@@ -86,18 +77,22 @@ in
       "module/wired-network" = {
         type = "internal/network";
         interface = "eno2";
+        interval = ".5";
+        label-connected = "%{F${colors.seperatorColor}}%{F-} %downspeed%  %{F${colors.seperatorColor}}%{F-} %upspeed%";
         label-foreground = "${colors.fg}";
       };
       "module/wireless-network" = {
         type = "internal/network";
         interface = "wlo1";
+        interval = ".5";
+        label-connected = "%{F${colors.seperatorColor}}%{F-} %downspeed%  %{F${colors.seperatorColor}}%{F-} %upspeed%";
         label-foreground = "${colors.fg}";
       };
 
       "module/cpu-temp" = {
         type = "internal/temperature";
-        format = "<label> ";
-        format-warn = "<label-warn> ";
+        format = "%{F${colors.seperatorColor}}CPU%{F-} <label> ";
+        format-warn = "%{F${colors.seperatorColor}}CPU%{F-} <label-warn> ";
         base-temperature = 20;
         warn-temperature = 85;
         label-warn-foreground = "${colors.warn}";
@@ -134,9 +129,10 @@ in
       "module/memory" = {
         type = "internal/memory";
         interval = 1;
+        format = "%{F${colors.seperatorColor}}RAM%{F-} <label>";
         label = "%used%";
         label-warn = "%used%";
-        warn-percentage = 70;
+        warn-percentage = 60;
         label-warn-foreground = "${colors.warn}";
       };
 
@@ -144,7 +140,6 @@ in
       "module/audio" = {
         type = "internal/alsa";
         use-ui-max = false;
-        interval = 5;
         label-volume = "%percentage%%";
         label-muted = "muted";
         label-muted-foreground = "${colors.altfg}";
@@ -155,9 +150,12 @@ in
         type = "custom/script";
         exec = "~/.config/scripts/status.sh";
         interval = 1;
-        click-left = "~/.config/scripts/start_replay.sh";
+        click-left = "~/.config/scripts/select_replay_windows.sh";
         click-middle = "~/.config/scripts/save_replay.sh";
         click-right = "~/.config/scripts/stop_replay.sh";
+
+        scroll-up = "~/.config/scripts/select_replay_windows.sh";
+        scroll-down = "~/.config/scripts/start_replay.sh";
       };
 
 
@@ -210,6 +208,14 @@ in
         adapter = "AC0";
         poll-interval = 4;
       };
+
+      "module/keyboard" = {
+        type = "internal/xkeyboard";
+        format = "<label-layout> <label-indicator>";
+      };
+
+
+
       "global/wm" = {
         override-redirect = false;
       };
@@ -234,17 +240,16 @@ in
         foreground = "${colors.fg}";
 
         # border for bar
-        # TODO for some reason i cant give the bar a margin-top and therefore i cant have a colored margin.. instead its invisible for now
         border-size = "10px";
         # border-color = ${colors.border}
         border-color = "${colors.invisible}";
 
         # Displayed modules
-        modules-left = "date s ewmh s wired-network wireless-network s audio s music";
+        modules-left = "date s keyboard s ewmh s wired-network wireless-network s audio s music";
         modules-center = "cava";
 
         # TODO Add gpu usage and temp 
-        modules-right = "battery-label battery s fs-label-data fs-data s fs-label-system fs-system s replay-label replay s ram-label memory s gpu-label gpu-usage gpu-temp s cpu-label cpu-temp cpu-usage";
+        modules-right = "battery-label battery s fs-label-data fs-data s fs-label-system fs-system s replay-label replay s memory s gpu-label gpu-usage gpu-temp s cpu-temp cpu-usage";
       };
     };
 
diff --git a/etc/configs/prometheus.nix b/etc/configs/prometheus.nix
new file mode 100644
index 0000000..cd036c3
--- /dev/null
+++ b/etc/configs/prometheus.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  services.prometheus.exporters.node = {
+    enable = false;
+    port = 9001;
+    openFirewall = true;
+    listenAddress = "32.54.31.0";
+  };
+}
diff --git a/nixos/configs/rofi.nix b/etc/configs/rofi.nix
similarity index 81%
rename from nixos/configs/rofi.nix
rename to etc/configs/rofi.nix
index 3eb7cd4..561eeb7 100755
--- a/nixos/configs/rofi.nix
+++ b/etc/configs/rofi.nix
@@ -4,6 +4,7 @@
     enable = true;
     font = "Jetbrains Mono";
     configPath = "$XDG_CONFIG_HOME/rofi/config.rasi";
+    # TODO for some reason the plugin doesn't work
     plugins = with pkgs; [ rofi-calc rofi-emoji ];
   };
 }
diff --git a/nixos/configs/st.nix b/etc/configs/st.nix
similarity index 100%
rename from nixos/configs/st.nix
rename to etc/configs/st.nix
diff --git a/nixos/configs/vscode.nix b/etc/configs/vscode.nix
similarity index 80%
rename from nixos/configs/vscode.nix
rename to etc/configs/vscode.nix
index 20c30d3..1efda25 100644
--- a/nixos/configs/vscode.nix
+++ b/etc/configs/vscode.nix
@@ -39,6 +39,12 @@
           version = "7.3.2";
           sha256 = "10q5w9g7ghn2qvdc7h2b79x1vy8nzpnwz8dbg1h03074ikhvjx4v";
         }
+        {
+          name = "ollama-autocoder";
+          publisher = "10nates";
+          version = "0.0.8";
+          sha256 = "0pxmlhj0isz1qr7pmmlrk6srylgwf6c0wqbp9q2ig0barl2qznai";
+        }
       ];
       userSettings = {
         "terminal.integrated.defaultProfile.linux" = "zsh";
@@ -50,6 +56,11 @@
         "vim.smartRelativeLine" = true;
         "rust-analyzer.cargo.sysroot" = "discover";
 
+        # ollama-autocoder
+        "ollama-autocoder.endpoint" = "http://localhost:11434/api/generate";
+        "ollama-autocoder.model" = "qwen:7b";
+        "ollama-autocoder.completion keys" = "ctrl+i";
+        "ollama-autocoder.prompt window size" = 400;
       };
       languageSnippets = {
         nix = {
diff --git a/nixos/configuration.nix b/etc/configuration.nix
similarity index 95%
rename from nixos/configuration.nix
rename to etc/configuration.nix
index 0463598..7c24165 100755
--- a/nixos/configuration.nix
+++ b/etc/configuration.nix
@@ -12,6 +12,7 @@
       ./system/essentials.nix
       ./system/shell.nix
       ./system/remap.nix
+      ./system/ssd.nix
 
       # rice and other usefull apps
       ./desktop.nix
@@ -42,7 +43,12 @@
 
 
       # libreoffice
-      # ./apps/office.nix
+      ./apps/office.nix
+
+
+      # node xporter
+      ./configs/prometheus.nix
+
 
     ];
 
diff --git a/nixos/desktop.nix b/etc/desktop.nix
similarity index 93%
rename from nixos/desktop.nix
rename to etc/desktop.nix
index acc70c5..fb9b20f 100755
--- a/nixos/desktop.nix
+++ b/etc/desktop.nix
@@ -29,15 +29,19 @@
     filezilla
 
     # screen sharing
-    #obs-studio
-    #qpwgraph
+    obs-studio
+    qpwgraph
 
     # work
     #figma-linux
     #kdenlive
 
     #video-trimmer
+    peek
 
+    # for replay 
+    xdotool
+    jq
   ];
   fonts.packages = with pkgs; [
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
diff --git a/nixos/dev.nix b/etc/dev.nix
similarity index 95%
rename from nixos/dev.nix
rename to etc/dev.nix
index e69e25e..da0ff38 100755
--- a/nixos/dev.nix
+++ b/etc/dev.nix
@@ -24,6 +24,8 @@
     nurl
     nix-init
 
-
+    # for 3d
+    blender
   ];
+
 }
diff --git a/nixos/flake.lock b/etc/flake.lock
similarity index 55%
rename from nixos/flake.lock
rename to etc/flake.lock
index b2d358c..7929893 100755
--- a/nixos/flake.lock
+++ b/etc/flake.lock
@@ -1,6 +1,70 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1714136352,
+        "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -23,16 +87,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711668574,
-        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
+        "lastModified": 1703013332,
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -52,6 +116,22 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1711668574,
+        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nvidia-patch": {
       "inputs": {
         "nixpkgs": [
@@ -75,8 +155,9 @@
     },
     "root": {
       "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "agenix": "agenix",
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nvidia-patch": "nvidia-patch"
       }
@@ -96,9 +177,24 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1710146030,
diff --git a/nixos/flake.nix b/etc/flake.nix
similarity index 88%
rename from nixos/flake.nix
rename to etc/flake.nix
index 6662732..9b16939 100755
--- a/nixos/flake.nix
+++ b/etc/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; # default packages
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; # unstable branch for newer packages
+    agenix.url = "github:ryantm/agenix";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
@@ -20,6 +21,7 @@
     , home-manager
     , nixpkgs-unstable
     , nvidia-patch
+    , agenix
     , ...
     }:
     let
@@ -40,7 +42,10 @@
               nvidia-patch.overlays.default
             ];
           })
-
+          {
+            environment.systemPackages = [ agenix.packages.${system}.default ];
+          }
+          agenix.nixosModules.default
           ./system/drivers/shitvidia-patch.nix
           ./configuration.nix
           home-manager.nixosModules.home-manager
diff --git a/nixos/gaming.nix b/etc/gaming.nix
similarity index 100%
rename from nixos/gaming.nix
rename to etc/gaming.nix
diff --git a/etc/hardware-configuration.nix b/etc/hardware-configuration.nix
new file mode 100755
index 0000000..ebc5e87
--- /dev/null
+++ b/etc/hardware-configuration.nix
@@ -0,0 +1,47 @@
+# 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.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/7610257f-16f7-41c2-a0d9-4e9f08f2b3e9";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-bbb8e429-bee1-4b5e-8ce8-c54f5f4f29a2".device = "/dev/disk/by-uuid/bbb8e429-bee1-4b5e-8ce8-c54f5f4f29a2";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/4362-33EF";
+      fsType = "vfat";
+    };
+
+  fileSystems."/mnt/terra" =
+    { device = "/dev/disk/by-uuid/f2b24250-0cf5-43d4-806f-7f024922781a";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/c680b02d-7de7-4cd7-855b-daec64833e3b"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/etc/opt/firefox/bookmarks.nix b/etc/opt/firefox/bookmarks.nix
new file mode 100755
index 0000000..638d06e
--- /dev/null
+++ b/etc/opt/firefox/bookmarks.nix
@@ -0,0 +1,29 @@
+[
+
+  {
+    name = "Stats";
+    tags = [ "metrics" ];
+    keyword = "grafana";
+    url = "http://stats.barna.local";
+  }
+  {
+    name = "Slskd - Soulseek server";
+    tags = [ "music" "piracy" ];
+    keyword = "slskd";
+    url = "http://32.54.31.5:5030";
+  }
+  {
+    name = "Gitea - berryez";
+    tags = [ "git" "code" ];
+    keyword = "gitea";
+    url = "https://git.berryez.xyz";
+  }
+  {
+    name = "NUR";
+    tags = [ "nixos" ];
+    keyword = "nur";
+    url = "https://nur.nix-community.org/";
+  }
+
+]
+
diff --git a/nixos/opt/firefox/user.js b/etc/opt/firefox/user.js
similarity index 100%
rename from nixos/opt/firefox/user.js
rename to etc/opt/firefox/user.js
diff --git a/nixos/opt/firefox/userChrome.css b/etc/opt/firefox/userChrome.css
similarity index 100%
rename from nixos/opt/firefox/userChrome.css
rename to etc/opt/firefox/userChrome.css
diff --git a/nixos/opt/firefox/userContent.css b/etc/opt/firefox/userContent.css
similarity index 100%
rename from nixos/opt/firefox/userContent.css
rename to etc/opt/firefox/userContent.css
diff --git a/nixos/opt/st/st.h b/etc/opt/st/st.h
similarity index 100%
rename from nixos/opt/st/st.h
rename to etc/opt/st/st.h
diff --git a/nixos/system/cursor.nix b/etc/system/cursor.nix
similarity index 100%
rename from nixos/system/cursor.nix
rename to etc/system/cursor.nix
diff --git a/nixos/system/display.nix b/etc/system/display.nix
similarity index 100%
rename from nixos/system/display.nix
rename to etc/system/display.nix
diff --git a/nixos/system/drivers/shitvidia-patch.nix b/etc/system/drivers/shitvidia-patch.nix
similarity index 93%
rename from nixos/system/drivers/shitvidia-patch.nix
rename to etc/system/drivers/shitvidia-patch.nix
index 3512819..26829e8 100755
--- a/nixos/system/drivers/shitvidia-patch.nix
+++ b/etc/system/drivers/shitvidia-patch.nix
@@ -15,7 +15,7 @@ in
   };
 
   # TODO fix hybrid optimus shit mode... add "intel" for inner display to work
-  services.xserver.videoDrivers = [ "nvidia" "intel" ];
+  services.xserver.videoDrivers = [ "nvidia"  ];
 
 
   nixpkgs.config.cudaSupport = true;
diff --git a/nixos/system/essentials.nix b/etc/system/essentials.nix
similarity index 99%
rename from nixos/system/essentials.nix
rename to etc/system/essentials.nix
index 2c21f41..bea4dc2 100755
--- a/nixos/system/essentials.nix
+++ b/etc/system/essentials.nix
@@ -13,4 +13,5 @@
 
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
+
 }
diff --git a/nixos/system/remap.nix b/etc/system/remap.nix
similarity index 100%
rename from nixos/system/remap.nix
rename to etc/system/remap.nix
diff --git a/nixos/system/security.nix b/etc/system/security.nix
similarity index 100%
rename from nixos/system/security.nix
rename to etc/system/security.nix
diff --git a/nixos/system/shell.nix b/etc/system/shell.nix
similarity index 56%
rename from nixos/system/shell.nix
rename to etc/system/shell.nix
index 5a834ba..4b9a2b8 100755
--- a/nixos/system/shell.nix
+++ b/etc/system/shell.nix
@@ -1,5 +1,11 @@
 { pkgs, ... }: {
 
+
+  environment.systemPackages = with pkgs; [
+    lolcat # cool colors
+    figlet # ascii generator
+  ];
+
   # setting zsh as default shell
   users.users.grape.shell = pkgs.zsh;
   programs.zsh.enable = true;
@@ -7,6 +13,7 @@
   home-manager.users.grape = {
     programs.zsh = {
       enable = true;
+      #defaultKeymap = "vicmd";
       shellAliases = {
         # essentials
         la = "ls -a";
@@ -23,6 +30,19 @@
 
         #nix
         garbage = "nix-collect-garbage -d";
+        dev = "nix develop --command zsh";
+
+        # ssh
+        pink = "ssh pink@32.54.31.99";
+        yellow = "ssh root@32.54.31.5";
+        carbon = "ssh carbon@32.54.31.180";
+        lime = "ssh lime@32.54.31.241";
+
+        # remote deployment
+
+        deploy-carbon = "nixos-rebuild switch --flake .#carbon --target-host root@32.54.31.180 --show-trace";
+        deploy-lime = "nixos-rebuild switch --flake .#lime --target-host root@32.54.31.241 --show-trace";
+        deploy-pink = "nixos-rebuild switch --flake .#pink --target-host root@32.54.31.99 --show-trace";
 
         # other
         sget = "yt-dlp -x --audio-format flac --embed-metadata --add-metadata '$1'";
@@ -34,8 +54,11 @@
         ts = "timew stop";
       };
 
+      # Cool rog logo (worth the ~2 seconds load time)
       initExtra = ''
-        PROMPT="[%M] %~ "
+        # for cinny to work
+        WEBKIT_DISABLE_COMPOSITING_MODE=1
+          PROMPT="[%M] %~ "
       '';
 
       sessionVariables = {
diff --git a/nixos/system/sound.nix b/etc/system/sound.nix
similarity index 100%
rename from nixos/system/sound.nix
rename to etc/system/sound.nix
diff --git a/etc/system/ssd.nix b/etc/system/ssd.nix
new file mode 100644
index 0000000..44012d3
--- /dev/null
+++ b/etc/system/ssd.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }: {
+
+  services.smartd = {
+    enable = true;
+    notifications.wall.enable = true;
+    devices = [
+      {
+        # System
+        device = "/dev/nvme1n1";
+      }
+      {
+        # Data
+        device = "/dev/nvme0n1";
+      }
+    ];
+  };
+}
diff --git a/nixos/apps/firefox.nix b/nixos/apps/firefox.nix
deleted file mode 100755
index 8b13789..0000000
--- a/nixos/apps/firefox.nix
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/readme.md b/readme.md
index 4b0787c..cde3b2b 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,42 @@
 ### My nixos rice
 
 ![](./rice.png)
+
+This setup has a lot of impurities, for one firefox with aboslute paths and for another, all my home-manager definitions are for user `grape`. I could go around changing it but im lazy
+
+# Keyboard shortcuts
+
+| Modifier    | name |
+| ----------- | ---- |
+| windows key | mod4 |
+
+# shadow replay
+
+| key-stroke | command                 | name                    |
+| ---------- | ----------------------- | ----------------------- |
+| mod4 + w   | saves replay            | w as in write to file   |
+| mod4 + a   | start replay for screen | a as in all             |
+| mod4 + x   | stops replay software   | x as in kill            |
+| mod4 + s   | focused window replay   | s as in selected window |
+
+# apps
+
+| key-stroke | command                    |
+| ---------- | -------------------------- |
+| mod4 + d   | rofi application launcher  |
+| mod4 + e   | rofi calculator            |
+| mod4 + t   | start terminal (allacrity) |
+| mod4 + r   | start firefox              |
+
+# languages
+
+| key-stroke | command      |
+| ---------- | ------------ |
+| mod4 + 1   | setxkbmap us |
+| mod4 + 2   | setxkbmap hu |
+
+# system
+
+| key-stroke            | command      |
+| --------------------- | ------------ |
+| mod4 + shift + delete | shutdown now |