From 6cbaf3e7abd32427c0231357f26d1fdd0f27dd31 Mon Sep 17 00:00:00 2001 From: Octelly Date: Mon, 19 Aug 2024 09:34:54 +0200 Subject: [PATCH] tons of smaller octelly home tweaks --- flake.lock | 57 +++++++++++- flake.nix | 6 +- users/octelly/default.nix | 91 +++++++++++++++---- .../colour_schemes/sonokai-shusia.moon | 88 ++++++++++++++++++ users/octelly/wezterm-src/config.moon | 38 ++++++++ users/octelly/wezterm-src/wezterm.moon | 52 +++++++++++ users/octelly/wezterm.lua | 7 ++ 7 files changed, 321 insertions(+), 18 deletions(-) create mode 100644 users/octelly/wezterm-src/colour_schemes/sonokai-shusia.moon create mode 100644 users/octelly/wezterm-src/config.moon create mode 100644 users/octelly/wezterm-src/wezterm.moon create mode 100644 users/octelly/wezterm.lua diff --git a/flake.lock b/flake.lock index 118482e..d7b644a 100755 --- a/flake.lock +++ b/flake.lock @@ -176,7 +176,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -232,6 +232,27 @@ "type": "github" } }, + "kwin-effects-forceblur": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1722982839, + "narHash": "sha256-UlyLqSUK5GJFeJ/8bX3Ja2aVIk09nimGtSEOLOhh82Y=", + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "rev": "521f7b56ae6c1c0f9f6a586bd77947321bc2f2ea", + "type": "github" + }, + "original": { + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "type": "github" + } + }, "master": { "locked": { "lastModified": 1722943531, @@ -464,6 +485,7 @@ "f2k": "f2k", "flatpaks": "flatpaks", "home": "home", + "kwin-effects-forceblur": "kwin-effects-forceblur", "master": "master", "nixHW": "nixHW", "nixos-cosmic": "nixos-cosmic", @@ -591,6 +613,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { "lastModified": 1722813957, @@ -625,6 +662,24 @@ "type": "github" } }, + "utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "vscode-ext": { "inputs": { "flake-compat": "flake-compat_2", diff --git a/flake.nix b/flake.nix index 151870a..37827e5 100755 --- 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 index 15385ea..5397ec7 100755 --- 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 new file mode 100644 index 0000000..6b77bfb --- /dev/null +++ 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 \ No newline at end of file diff --git a/users/octelly/wezterm-src/config.moon b/users/octelly/wezterm-src/config.moon new file mode 100644 index 0000000..3b73131 --- /dev/null +++ b/users/octelly/wezterm-src/config.moon @@ -0,0 +1,38 @@ +wezterm = require 'wezterm' + +{ + check_for_updates: false + front_end: "WebGpu" + + color_scheme: 'sonokai-shusia' + font: wezterm.font_with_fallback { + 'Maple Mono NF' + 'Twemoji' + } + font_size: 12.0 + bold_brightens_ansi_colors: false + + adjust_window_size_when_changing_font_size: false + enable_scroll_bar: true + exit_behavior_messaging: "Terse" + + hide_tab_bar_if_only_one_tab: true + use_fancy_tab_bar: false + tab_max_width: 64 + --show_tab_index_in_tab_bar: false + + force_reverse_video_cursor: true + default_cursor_style: "BlinkingBlock" + cursor_blink_rate: 400 + cursor_blink_ease_in: "Constant" + cursor_blink_ease_out: "Constant" + + --window_background_opacity: 0.9 + window_background_opacity: 1 + inactive_pane_hsb: { + saturation: 1 + brightness: 0.9 + } + + animation_fps: 60 +} diff --git a/users/octelly/wezterm-src/wezterm.moon b/users/octelly/wezterm-src/wezterm.moon new file mode 100644 index 0000000..2189820 --- /dev/null +++ b/users/octelly/wezterm-src/wezterm.moon @@ -0,0 +1,52 @@ +wezterm = require 'wezterm' + +wezterm.on 'update-status', (window, pane) -> + meta = pane\get_metadata() or {} + process = pane\get_foreground_process_info() + overrides = window\get_config_overrides() or {} + + if meta.password_input + overrides.cursor_blink_ease_in = "EaseIn" + overrides.cursor_blink_ease_out = "EaseOut" + overrides.cursor_blink_rate = 1000 + else + overrides.cursor_blink_ease_in = nil + overrides.cursor_blink_ease_out = nil + overrides.cursor_blink_rate = nil + + if string.find(string.lower(process.name), "craftos") or string.find(string.lower(process.executable), "craftos") + for arg in *process.argv + if arg == '-c' or arg == '--cli' + overrides.colors = { + background: '#0d0d0d' + } + overrides.font = wezterm.font_with_fallback{ + 'Monocraft' + } + overrides.enable_scroll_bar = false + break + else + overrides.colors = nil + overrides.font = nil + overrides.enable_scroll_bar = nil + + window\set_config_overrides(overrides) + +colour_schemes_dir = '/colour_schemes' + +config = if wezterm.config_builder + wezterm.config_builder() +else + {} + +with config + .color_schemes = {} + + for file in *wezterm.read_dir(wezterm.config_dir .. colour_schemes_dir) + name = file\sub(#wezterm.config_dir+#colour_schemes_dir+2, -5) + .color_schemes[name] = require(file\sub(#wezterm.config_dir+2, -5)) + +for k, v in pairs require 'config' + config[k] = v + +return config \ No newline at end of file diff --git a/users/octelly/wezterm.lua b/users/octelly/wezterm.lua new file mode 100644 index 0000000..d1dd8ca --- /dev/null +++ b/users/octelly/wezterm.lua @@ -0,0 +1,7 @@ +local wezterm = require 'wezterm' + +local config = wezterm.config_builder() + +config.window_background_opacity = 0.5 + +return config \ No newline at end of file