From e01f925f0aac98d226f9179410eadd188539a199 Mon Sep 17 00:00:00 2001
From: fwastring <fredrik@wastring.com>
Date: Thu, 13 Nov 2025 08:53:05 +0100
Subject: [PATCH] cleanup

---
 .xinitrc                          | 21 ---------------------
 .xinitrc.jobb                     | 23 -----------------------
 .xinitrc.laptop                   | 21 ---------------------
 maskiner/core/configuration.nix   | 14 +-------------
 maskiner/legacy/configuration.nix | 12 ------------
 moduler/fish.nix                  |  2 +-
 moduler/programs.nix              |  5 ++---
 7 files changed, 4 insertions(+), 94 deletions(-)
 delete mode 100755 .xinitrc
 delete mode 100755 .xinitrc.jobb
 delete mode 100755 .xinitrc.laptop

diff --git a/.xinitrc b/.xinitrc
deleted file mode 100755
index 1e8f15e..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-	eval $(dbus-launch --exit-with-session --sh-syntax)
-fi
-systemctl --user import-environment DISPLAY XAUTHORITY
-
-if command -v dbus-update-activation-environment >/dev/null 2>&1; then
-  dbus-update-activation-environment DISPLAY XAUTHORITY
-fi
-
-xrdb -merge ~/.Xresources
-setxkbmap -option caps:swapescape
-
-feh --bg-scale ~/nix/wallpapers/blue.png
-
-dwmblocks &
-dunst &
-xbanish &
-
-exec dwm
diff --git a/.xinitrc.jobb b/.xinitrc.jobb
deleted file mode 100755
index 15dc89f..0000000
--- a/.xinitrc.jobb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-	eval $(dbus-launch --exit-with-session --sh-syntax)
-fi
-systemctl --user import-environment DISPLAY XAUTHORITY
-
-if command -v dbus-update-activation-environment >/dev/null 2>&1; then
-  dbus-update-activation-environment DISPLAY XAUTHORITY
-fi
-
-xrdb -merge ~/.Xresources
-setxkbmap -option caps:swapescape
-
-feh --bg-scale ~/nix/wallpapers/blue.png
-
-dwmblocks &
-dunst &
-xbanish &
-
-# xrandr --output eDP-1 --mode 1920x1080 --pos 3840x1080 --rotate normal --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --off --output DP-1-1 --off --output DP-1-2 --primary --mode 3840x2160 --pos 0x0 --rotate normal --output DP-1-3 --off
-
-exec dwm
diff --git a/.xinitrc.laptop b/.xinitrc.laptop
deleted file mode 100755
index 8d97148..0000000
--- a/.xinitrc.laptop
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-	eval $(dbus-launch --exit-with-session --sh-syntax)
-fi
-systemctl --user import-environment DISPLAY XAUTHORITY
-
-if command -v dbus-update-activation-environment >/dev/null 2>&1; then
-  dbus-update-activation-environment DISPLAY XAUTHORITY
-fi
-
-xrdb -merge ~/.Xresources
-setxkbmap -option caps:swapescape
-
-feh --bg-center ~/nix/wallpapers/blue.png
-
-dwmblocks &
-dunst &
-xbanish &
-
-exec dwm
diff --git a/maskiner/core/configuration.nix b/maskiner/core/configuration.nix
index 5ae5e2b..c43295a 100644
--- a/maskiner/core/configuration.nix
+++ b/maskiner/core/configuration.nix
@@ -10,7 +10,7 @@
   ...
 }:
 let
-  theme = "mocha";
+  theme = "latte";
 in
 {
   imports = [
@@ -88,18 +88,6 @@ in
       enable = true;
       theme = theme;
     };
-    programs.zsh = {
-      enable = true;
-      enableCompletion = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
-
-      shellAliases = {
-        ll = "ls -l";
-        update = "sudo nixos-rebuild switch";
-      };
-      history.size = 10000;
-    };
     oh-my-posh = {
       enable = true;
       theme = theme;
diff --git a/maskiner/legacy/configuration.nix b/maskiner/legacy/configuration.nix
index 2fd261c..da1bb90 100644
--- a/maskiner/legacy/configuration.nix
+++ b/maskiner/legacy/configuration.nix
@@ -88,18 +88,6 @@ in
       enable = true;
       theme = theme;
     };
-    programs.zsh = {
-      enable = true;
-      enableCompletion = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
-
-      shellAliases = {
-        ll = "ls -l";
-        update = "sudo nixos-rebuild switch";
-      };
-      history.size = 10000;
-    };
     oh-my-posh = {
       enable = true;
       theme = theme;
diff --git a/moduler/fish.nix b/moduler/fish.nix
index 134d638..0515bec 100644
--- a/moduler/fish.nix
+++ b/moduler/fish.nix
@@ -102,7 +102,7 @@ in
           set -Ux FZF_CTRL_R_OPTS "--reverse"
           set -Ux FZF_TMUX_OPTS "-p"
           set -e GOROOT
-          set -e GOPATH
+		  set -x -U GOPATH $HOME/.go
           gh completion -s fish > ~/.config/fish/completions/gh.fish
           set -gx PATH $PATH $HOME/.krew/bin
 
diff --git a/moduler/programs.nix b/moduler/programs.nix
index 67dbcb1..be38936 100644
--- a/moduler/programs.nix
+++ b/moduler/programs.nix
@@ -43,7 +43,6 @@
 
     # Browsers
     librewolf
-    chawan
 
     # Displaying
     zathura
@@ -53,8 +52,8 @@
     # System
     pavucontrol
     pulseaudio
-    devour # Swallow windows
-    caligula # Burn ISOs
+    devour
+    caligula
     ptouch-print
 	xev