first push in a while

4 files changed, 34 insertions, 22 deletions

diff --git a/configuration.nix b/configuration.nix
index 9cb9306..31ead1f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -29,9 +29,9 @@
 
   virtualisation.docker.enable = true;
   services.xserver = {
-    layout = "us";
-    xkbVariant = "";
-    xkbOptions = "caps:escape";
+    xkb.layout = "us";
+    xkb.variant = "";
+    xkb.options = "caps:escape";
   };
 
   services.ollama = {
@@ -82,8 +82,6 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
-    nixpkgs-fmt
-    rnix-lsp
     curl
     git
     groff
diff --git a/flake.lock b/flake.lock
index ad9d6b9..eca5746 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,16 +43,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715542476,
-        "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=",
+        "lastModified": 1716330097,
+        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19",
+        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 717ff18..59823ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "A comprehensive NixOS+Emacs+HyprLand Configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home.nix b/home.nix
index 96c0d46..96d7ebb 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,6 @@
 { config, lib, nixpkgs, pkgs, wallpapers, scripts, ... }:
 {
-
+  home.enableNixpkgsReleaseCheck = false;
   home.username = "preston";
   home.homeDirectory = "/home/preston";
   home.packages = with pkgs; [
@@ -46,8 +46,7 @@
     pipes
     cmatrix
     inkscape
-    rnix-lsp
-    nixfmt
+    nixfmt-rfc-style
     podman-desktop
     monero-gui
     electrum
@@ -58,12 +57,13 @@
     tor-browser
     qsynth
     poetry
+    vesktop
+    nixd
     (nerdfonts.override { fonts = [ "Iosevka" ]; })
-    (discord.override {
-      withOpenASAR = true;
-      withVencord = true;
-    })
-    chromium
+#    (discord.override {
+#      withOpenASAR = true;
+#      withVencord = true;
+#    })
     python311Packages.python-lsp-server
   ];
   fonts.fontconfig.enable = true;
@@ -112,6 +112,14 @@
     };
   };
 
+  programs.chromium = {
+    enable = true;
+    extensions = [
+      "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock-origin lite
+      "dbepggeogbaibhgnhhndojpepiihcmeb" # vimium
+      "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
+    ];
+  };
 
   programs.nushell = {
     enable = true;
@@ -864,6 +872,11 @@
       h = "Hyprland";
       r = "gammastep -O 3000";
     };
+    loginExtra = ''
+if [ "$(tty)" = "/dev/tty1" ];then
+  exec Hyprland
+fi
+    '';
   };
 
   programs.emacs = {
@@ -1014,7 +1027,7 @@
       "$mod" = "SUPER";
       exec-once = [
         "waybar"
-        "swww init"
+        "swww-daemon --format xrgb"
         "swww img ${wallpapers}/imagination.png"
         "fcitx5-remote -r"
         "fcitx5 -d --replace"
@@ -1026,8 +1039,10 @@
       windowrule = [
         "workspace 1, ^(.*emacs.*)$"
         "workspace 2, ^(.*firefox.*)$"
-        "workspace 2, ^(.*chromium-browser.*)$"
+        "workspace 2, ^(.*Chromium-browser.*)$"
+        "workspace 2, ^(.*chromium.*)$"
         "workspace 3, ^(.*discord.*)$"
+        "workspace 3, ^(.*vesktop.*)$"
         "workspace 3, ^(.*fluffychat.*)$"
         "workspace 3, ^(.*element-desktop.*)$"
         "workspace 5, ^(.*Monero.*)$"
@@ -1041,7 +1056,7 @@
         "$mod, E, exec, emacs"
         "$mod, B, exec, electrum"
         "$mod, M, exec, monero-wallet-gui"
-        "$mod, V, exec, Discord"
+        "$mod, V, exec, vesktop"
         "$mod, T, exec, veracrypt"
         "$mod, C, exec, fluffychat"
         "$mod, D, exec, wofi --show run"
@@ -1105,7 +1120,6 @@
         repeat_rate = 50;
       };
       misc = {
-        force_hypr_chan = false;
         force_default_wallpaper = 0;
         disable_hyprland_logo = true;
       };