tons of smaller octelly home tweaks

OwO-Digital · Aug 19, 2024 · 6cbaf3e · 6cbaf3e
1 parent f78a18a
commit 6cbaf3e
Show file tree

Hide file tree

Showing 7 changed files with 321 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -13,6 +13,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home";
     };
+    kwin-effects-forceblur = {
+      url = "github:taj-ny/kwin-effects-forceblur";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nixHW.url = "github:nixos/nixos-hardware/master";
     f2k = {
       url = "github:moni-dz/nixpkgs-f2k";
@@ -76,7 +80,7 @@
           allowUnfree = true;
           allowBroken = true;
           permittedInsecurePackages = [
-            "electron-11.5.0"
+            "freeimage-unstable-2021-11-01" # for EmulationStation DE (desktop edition)
           ];
         };
 

diff --git a/users/octelly/default.nix b/users/octelly/default.nix
@@ -168,10 +168,6 @@ rec {
 
         #cinnamon.nemo-with-extensions
 
-        tetrio-desktop
-        xonotic-glx
-        dolphin-emu
-
         #libsForQt5.dolphin
         #libsForQt5.dolphin-plugins
         #libsForQt5.kio
@@ -194,7 +190,6 @@ rec {
 
         #luakit
 
-        #nextcloud-client
         #qownnotes
 
         #rnix-lsp
@@ -217,6 +212,7 @@ rec {
         #wofi
 
         mpv
+        jamesdsp
 
         #gtklock
         #gtklock-userinfo-module
@@ -251,10 +247,26 @@ rec {
         #gamescope
         #mangohud
         #tmuf
+        tetrio-desktop
+        xonotic-glx
+        dolphin-emu
+        emulationstation-de
 
         # plasma theme thing
         klassy
 
+        inputs.kwin-effects-forceblur.packages.${pkgs.system}.default
+
+        kdePackages.kclock
+
+        # spelling stuff
+        # is also used by Plasma
+        aspell
+        aspellDicts.cs
+        aspellDicts.en
+        aspellDicts.en-computers
+        aspellDicts.en-science
+
         #krdc
 
         # flameshot and dependencies
@@ -264,6 +276,10 @@ rec {
         # archive manager
         #mate.engrampa
 
+        gimp-with-plugins
+        inkscape-with-extensions
+        aseprite
+
         planify
         newsflash
 
@@ -726,11 +742,6 @@ rec {
         path = "" + (putTogether {
           name = "octelly-wallpapers-plasma";
           srcs = [
-            (wallhaven {
-              id = "exlz5l";
-              ext = "jpg";
-              sha256 = "1kkr525abi0iggzxz6w4vnda3yb3pn3r6j6y7svmlng844xls8ys";
-            })
             (wallhaven {
               id = "m3rm11";
               ext = "png";
@@ -746,11 +757,6 @@ rec {
               ext = "jpg";
               sha256 = "0r0xk737jqbw4n0hpc3y9ckdsgy19flbd6j5j9wknygkfzsvlfa5";
             })
-            (wallhaven {
-              id = "8oroqk";
-              ext = "png";
-              sha256 = "0x27xwjkc9rr3x2zxfcapq31z31jgd5cvld8n95s6gpr9c0dy3kw";
-            })
             (wallhaven {
               id = "x8kkd3";
               ext = "jpg";
@@ -761,6 +767,41 @@ rec {
               ext = "jpg";
               sha256 = "0k02j7f1f8sxg3ali8s2hr3r8864ssq1i90jimk0as34ffvsjwn0";
             })
+            (wallhaven {
+              id = "zyv5qj";
+              ext = "jpg";
+              sha256 = "0jy8lhb9a29w55f96rjj5pzbcfhqy7gb9i1i8za9imgyvvn5nirr";
+            })
+            (wallhaven {
+              id = "yxr83d";
+              ext = "jpg";
+              sha256 = "03nk3savqylsc38j5cynb4prjrjbzi7pl06yly51sm0h30i8zjwi";
+            })
+            (wallhaven {
+              id = "1pok23";
+              ext = "jpg";
+              sha256 = "0qiynj9hc4mdcs3a6s19vqr5ajx7yrp01nimkvclshh5l7ss9n8j";
+            })
+            (wallhaven {
+              id = "l8r6oy";
+              ext = "jpg";
+              sha256 = "10zraaxj781wgaz3aa7xvlrg8sjsbllkkgcpl0qksk4q7j349dxs";
+            })
+            (wallhaven {
+              id = "5gj8w9";
+              ext = "png";
+              sha256 = "0v64sb41lpks148acq1s3k0y24vp2qim1wkqxah4rxq5lqzjsk42";
+            })
+            (wallhaven {
+              id = "x6ojqd";
+              ext = "jpg";
+              sha256 = "0qrby4fvicy9hys0jpd0zwvfdz20hmw2ahssm464kqgg1mni6rkm";
+            })
+            (wallhaven {
+              id = "p91pjm";
+              ext = "jpg";
+              sha256 = "0izpvcifawl251j3iprm2g0g4zl8x7rv83q0x9naggf1vbr7h2f0";
+            })
           ];
         });
       };
@@ -803,6 +844,11 @@ rec {
     package = pkgs.kdePackages.kdeconnect-kde;
   };
 
+  services.nextcloud-client = {
+    enable = true;
+    startInBackground = true;
+  };
+
   programs.vscode = {
     enable = true;
     extensions = (with pkgs.open-vsx; [
@@ -1042,11 +1088,24 @@ rec {
 
         "BookmarkBarEnabled" = false;
         "BrowserThemeColor" = "#000000";
-        "NewTabPageLocation" = "https://start.johnystar.moe/";
         "HomepageIsNewTabPage" = true;
         "ShowHomeButton" = false;
       };
       "kitty/themes/sonokai-shusia.conf".source = ./sonokai-shusia.conf;
+      "wezterm".source = pkgs.stdenv.mkDerivation {
+        name = "octelly-wezterm-config";
+        src = ./wezterm-src;
+
+        nativeBuildInputs = with pkgs; [
+          luajitPackages.moonscript
+        ];
+
+        buildPhase = ''
+          mkdir -p $out
+
+          moonc -t $out .
+        '';
+      };
       "qtile".source = ./desktop_environments/qtile;
 
       "swaync/config.json".text = builtins.toJSON {

diff --git a/users/octelly/wezterm-src/colour_schemes/sonokai-shusia.moon b/users/octelly/wezterm-src/colour_schemes/sonokai-shusia.moon
@@ -0,0 +1,88 @@
+p = {
+    black:       "#1a181a"
+    bg_dim:      "#211f21"
+    bg0:         "#2d2a2e"
+    bg1:         "#37343a"
+    bg2:         "#3b383e"
+    bg3:         "#423f46"
+    bg4:         "#49464e"
+    gray_dim:    "#605d68"
+    red:         "#f85e84"
+    orange:      "#ef9062"
+    yellow:      "#e5c463"
+    green:       "#9ecd6f"
+    blue:        "#7accd7"
+    purple:      "#ab9df2"
+    fg:          "#e3e1e4"
+    gray:        "#848089"
+    bg_red:      "#ff6188"
+    diff_red:    "#55393d"
+    diff_green:  "#394634"
+    bg_green:    "#a9dc76"
+    bg_blue:     "#78dce8"
+    diff_blue:   "#354157"
+    diff_yellow: "#4e432f"
+}
+
+scheme = with {}
+    .foreground = p.fg
+    .background = "#343136"
+    --            ^ default terminal
+    --            | background on the VSCode
+    --            | version
+
+    .cursor_bg = p.fg
+    .cursor_fg = "#477379"
+    --           ^ used in fg text
+    --           | on blue here: 
+    --           | https://github.com/sainnhe/sonokai
+    .cursor_border = .cursor_bg
+
+    .selection_bg = p.red  -- just personal preference
+    .selection_fg = "#993E55"
+    --           ^ used in fg text
+    --           | on red here: 
+    --           | https://github.com/sainnhe/sonokai
+
+    .scrollbar_thumb = p.bg4
+
+    .split = p.black
+
+    .ansi = {
+        .background
+        p.red
+        p.green
+        p.yellow
+        p.blue
+        p.purple
+        "#78dce8"  -- FIXME: too similar to blue
+        .foreground
+    }
+
+    .brights = .ansi
+    .brights[1] = p.bg4
+
+    .tab_bar = {}
+    .tab_bar.background = p.bg0
+    --.tab_bar.background = "#242124"
+
+    .tab_bar.active_tab = {
+        bg_color: .background
+        fg_color: .foreground
+    }
+    .tab_bar.inactive_tab = {
+        bg_color: .tab_bar.background
+        fg_color: p.gray
+        intensity: "Half"
+    }
+    .tab_bar.inactive_tab_hover = {
+        bg_color: .tab_bar.background
+        fg_color: p.red
+        italic: false
+        intensity: "Bold"
+    }
+
+    .tab_bar.new_tab       = .tab_bar.inactive_tab
+    .tab_bar.new_tab_hover = .tab_bar.inactive_tab_hover
+
+return scheme