From 0722c39448ffa44bba7e9cf2906377e5eb759f65 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Mon, 20 Oct 2025 16:11:30 -0700 Subject: [PATCH] enough styles --- flake.lock | 296 +-------------- flake.nix | 4 - home-manager/common.nix | 5 +- home-manager/modules/de2u.nix | 2 - home-manager/modules/de3u.nix | 2 - home-manager/modules/ezpcusr.nix | 59 --- home-manager/modules/zed-transparent.mustache | 352 ------------------ home-manager/users/notgne2.nix | 149 +------- modules/ezpc.nix | 2 +- 9 files changed, 5 insertions(+), 866 deletions(-) delete mode 100644 home-manager/modules/zed-transparent.mustache diff --git a/flake.lock b/flake.lock index 0866039..64341e9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,73 +1,5 @@ { "nodes": { - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - } - }, "bemoji": { "flake": false, "locked": { @@ -100,43 +32,6 @@ "type": "github" } }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -155,39 +50,6 @@ "type": "github" } }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "48.2", - "repo": "gnome-shell", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -224,31 +86,6 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": [ - "stylix", - "flake-parts" - ], - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", - "owner": "nix-community", - "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -280,8 +117,7 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs", "plasma-manager": "plasma-manager", - "rycee": "rycee", - "stylix": "stylix" + "rycee": "rycee" } }, "rycee": { @@ -300,40 +136,6 @@ "type": "gitlab" } }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts", - "gnome-shell": "gnome-shell", - "nixpkgs": [ - "nixpkgs" - ], - "nur": "nur", - "systems": "systems_2", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-schemes": "tinted-schemes", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" - }, - "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", - "owner": "danth", - "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -348,102 +150,6 @@ "repo": "default", "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" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "type": "github" - } - }, - "tinted-schemes": { - "flake": false, - "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", - "owner": "tinted-theming", - "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "schemes", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b401b0a..4bac7ae 100644 --- a/flake.nix +++ b/flake.nix @@ -27,10 +27,6 @@ url = "github:mattydebie/bitwarden-rofi"; flake = false; }; - stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { diff --git a/home-manager/common.nix b/home-manager/common.nix index 45ebdb9..6b115c6 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -6,7 +6,6 @@ inputs: all: { }: { imports = [ all - inputs.stylix.homeModules.stylix ]; programs.direnv = { @@ -92,7 +91,7 @@ inputs: all: { nativeMessagingHosts = [pkgs.fx-cast-bridge]; profiles.default = { - extensions = lib.optionals (pkgs ? nur.repos.rycee.firefox-addons) (with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = lib.optionals (pkgs ? nur.repos.rycee.firefox-addons) (with pkgs.nur.repos.rycee.firefox-addons; [ darkreader bitwarden violentmonkey @@ -134,7 +133,7 @@ inputs: all: { # # LibreWolf ruins the user agent making sites unusable without RFP, so use the user agent from RFP manually. This also seems sane for compatibility when using Firefox. # "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"; # set the user agent to a _realistic_ user agent because cloudflare keeps sniffing my balls - # "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:136.0) Gecko/20100101 Firefox/136."; + "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:136.0) Gecko/20100101 Firefox/143."; "general.useragent.compatMode.firefox" = true; }; }; diff --git a/home-manager/modules/de2u.nix b/home-manager/modules/de2u.nix index b7a6fbc..5b6449b 100644 --- a/home-manager/modules/de2u.nix +++ b/home-manager/modules/de2u.nix @@ -24,8 +24,6 @@ in { }; config = mkIf cfg.enable { - stylix.enable = lib.mkDefault true; - programs.librewolf.enable = true; programs.kermit = { diff --git a/home-manager/modules/de3u.nix b/home-manager/modules/de3u.nix index 0e2356b..a418a47 100644 --- a/home-manager/modules/de3u.nix +++ b/home-manager/modules/de3u.nix @@ -28,8 +28,6 @@ in { }; config = mkIf cfg.enable { - stylix.enable = lib.mkDefault true; - home.file."${config.home.homeDirectory}/.gtkrc-2.0".force = true; gtk.cursorTheme.name = "breeze_cursors"; gtk.cursorTheme.size = 24; diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index 51d9660..76a941e 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -10,12 +10,6 @@ in { options.ezpcusr = { enable = mkEnableOption "Enable simple PC user config"; - uploadScript = mkOption { - type = types.nullOr types.package; - default = null; - description = "A path to a script that takes a path to a file and returns a URL"; - }; - screenshotsPath = mkOption { description = "Path to save screenshots in"; default = "$HOME/Media/Screenshots"; @@ -168,11 +162,6 @@ in { "$mod, D, exec, ${config.programs.rofi.package}/bin/rofi -show drun -show-icons" ", Print, exec, ${config.services.flameshot.package}/bin/flameshot gui -p=\"${config.services.flameshot.settings.General.savePath}/$(date '+${config.services.flameshot.settings.General.filenamePattern}')\" --raw | wl-copy -t image/png" - # "SHIFT, Print, exec, ${pkgs.wl-clipboard}/bin/wl-paste > /tmp/clipup && ${ - # if cfg.uploadScript != null - # then cfg.uploadScript - # else ":" - # } /tmp/clipup | wl-copy && ${pkgs.libnotify}/bin/notify-send 'Clipboard uploaded!'" "$mod, c, exec, ${config.services.cliphist.package}/bin/cliphist list | rofi -dmenu | cliphist decode | wl-copy" @@ -322,54 +311,8 @@ in { }; }; - programs.ashell = { - enable = false; - systemd.enable = true; - settings = { - clock.format = "%a %d %b %r"; - workspaces.visibility_mode = "MonitorSpecific"; - modules = { - left = [["Workspaces" "WindowTitle"] "Tray"]; - center = ["MediaPlayer"]; - right = ["SystemInfo" ["Clock" "Privacy" "Settings"]]; - }; - }; - }; - programs.librewolf.enable = true; - programs.zed-editor = { - themes.transparency = config.lib.stylix.colors { - template = ./zed-transparent.mustache; - extension = ".json"; - }; - userSettings.theme = lib.mkForce "Base16 Transparent ${config.lib.stylix.colors.scheme-name}"; - }; - - stylix = { - enable = lib.mkDefault true; - autoEnable = lib.mkDefault true; - - icons = { - enable = lib.mkDefault true; - dark = lib.mkDefault "Papirus-Dark"; - package = lib.mkDefault pkgs.papirus-icon-theme; - }; - - cursor = { - package = lib.mkDefault pkgs.adwaita-icon-theme; - name = lib.mkDefault "Adwaita"; - size = lib.mkDefault 24; - }; - - opacity = { - terminal = lib.mkDefault 0.85; - popups = lib.mkDefault 0.7; - desktop = lib.mkDefault 0.6; - applications = lib.mkDefault 0.85; - }; - }; - services.blueman-applet.enable = lib.mkDefault cfg.bluetooth; services.mpris-proxy.enable = lib.mkDefault true; @@ -429,8 +372,6 @@ in { savePath = "${config.home.homeDirectory}/Media/Screenshots"; saveAfterCopy = true; useGrimAdapter = true; - #uiColor = "#${lib.stylix.colors.base04}"; - #contrastUiColor = "#${lib.stylix.colors.base05}"; }; }; diff --git a/home-manager/modules/zed-transparent.mustache b/home-manager/modules/zed-transparent.mustache deleted file mode 100644 index ab093f7..0000000 --- a/home-manager/modules/zed-transparent.mustache +++ /dev/null @@ -1,352 +0,0 @@ -{ - "name": "Base16 Transparent {{scheme-name}}", - "author": "notgne2", - "themes": [ - { - "name": "Base16 Transparent {{scheme-name}}", - "appearance": "dark", - "style": { - "background.appearance": "blurred", - "border": "#00000000", - "border.variant": "#00000000", - "border.focused": null, - "border.selected": null, - "border.transparent": null, - "border.disabled": null, - "elevated_surface.background": "#{{base01-hex}}d9", - "surface.background": "#{{base00-hex}}d9", - "background": "#{{base00-hex}}d9", - "element.background": "#{{base00-hex}}", - "element.hover": "#{{base01-hex}}ff", - "element.active": "#{{base02-hex}}ff", - "element.selected": "#{{base02-hex}}ff", - "element.disabled": "#{{base03-hex}}d3", - "ghost_element.background": "#{{base00-hex}}", - "ghost_element.hover": "#{{base01-hex}}ff", - "ghost_element.active": "#{{base02-hex}}ff", - "ghost_element.selected": "#{{base02-hex}}ff", - "ghost_element.disabled": "#{{base03-hex}}d3", - "drop_target.background": "#{{base03-hex}}d3", - "text": "#{{base05-hex}}", - "text.muted": "#{{base04-hex}}", - "text.placeholder": "#{{base03-hex}}", - "text.disabled": "#{{base03-hex}}", - "text.accent": "#{{base0D-hex}}", - "icon": "#{{base05-hex}}", - "icon.muted": "#{{base03-hex}}", - "icon.disabled": "#{{base03-hex}}", - "icon.placeholder": "#{{base03-hex}}", - "icon.accent": "#{{base0D-hex}}", - "status_bar.background": "#{{base00-hex}}d9", - "title_bar.background": "#{{base00-hex}}d9", - "title_bar.inactive_background": "#{{base00-hex}}d9", - "toolbar.background": "#00000000", - "tab_bar.background": "#00000000", - "tab.inactive_background": "#00000000", - "tab.active_background": "#{{base01-hex}}", - "search.match_background": "#{{base02-hex}}", - "panel.background": "#00000000", - "panel.focused_border": null, - "pane.focused_border": "#{{base00-hex}}", - "scrollbar.thumb.background": "#{{base01-hex}}d3", - "scrollbar.thumb.hover_background": "#{{base02-hex}}", - "scrollbar.thumb.border": "#00000000", - "scrollbar.track.background": "#00000000", - "scrollbar.track.border": "#00000000", - "editor.foreground": "#{{base05-hex}}", - "editor.background": "#00000000", - "editor.gutter.background": "#00000000", - "editor.subheader.background": "#{{base00-hex}}", - "editor.active_line.background": "#{{base01-hex}}d9", - "editor.highlighted_line.background": "#{{base02-hex}}", - "editor.line_number": "#{{base03-hex}}", - "editor.active_line_number": "#{{base05-hex}}", - "editor.invisible": "#{{base03-hex}}", - "editor.wrap_guide": "#{{base03-hex}}", - "editor.active_wrap_guide": "#{{base03-hex}}d3", - "editor.document_highlight.read_background": "#{{base02-hex}}d3", - "editor.document_highlight.write_background": "#{{base03-hex}}d3", - "link_text.hover": "#{{base0D-hex}}", - - "conflict": "#{{base0B-hex}}", - "conflict.background": "#{{base0B-hex}}d3", - "conflict.border": "#{{base03-hex}}", - - "created": "#{{base0B-hex}}", - "created.background": "#{{base0B-hex}}d3", - "created.border": "#{{base03-hex}}", - - "deleted": "#{{base08-hex}}", - "deleted.background": "#{{base08-hex}}d3", - "deleted.border": "#{{base03-hex}}", - - "error": "#{{base08-hex}}", - "error.background": "#{{base08-hex}}d3", - "error.border": "#{{base03-hex}}", - - "hidden": "#{{base03-hex}}", - "hidden.background": "#{{base00-hex}}", - "hidden.border": "#{{base03-hex}}", - - "hint": "#{{base0D-hex}}", - "hint.background": "#{{base0D-hex}}d3", - "hint.border": "#{{base03-hex}}", - - "ignored": "#{{base03-hex}}", - "ignored.background": "#{{base00-hex}}", - "ignored.border": "#{{base03-hex}}", - - "info": "#{{base0D-hex}}", - "info.background": "#{{base0D-hex}}d3", - "info.border": "#{{base03-hex}}", - - "modified": "#{{base0A-hex}}", - "modified.background": "#{{base0A-hex}}d3", - "modified.border": "#{{base03-hex}}", - - "predictive": "#{{base0E-hex}}", - "predictive.background": "#{{base0E-hex}}d3", - "predictive.border": "#{{base03-hex}}", - - "renamed": "#{{base0D-hex}}", - "renamed.background": "#{{base0D-hex}}d3", - "renamed.border": "#{{base03-hex}}", - - "success": "#{{base0B-hex}}", - "success.background": "#{{base0B-hex}}d3", - "success.border": "#{{base03-hex}}", - - "unreachable": "#{{base03-hex}}", - "unreachable.background": "#{{base00-hex}}", - "unreachable.border": "#{{base03-hex}}", - - "warning": "#{{base0A-hex}}", - "warning.background": "#{{base0A-hex}}d3", - "warning.border": "#{{base03-hex}}", - - "players": [ - { - "cursor": "#{{base0D-hex}}", - "background": "#{{base0D-hex}}20", - "selection": "#{{base0D-hex}}30" - }, - { - "cursor": "#{{base0E-hex}}", - "background": "#{{base0E-hex}}20", - "selection": "#{{base0E-hex}}30" - }, - { - "cursor": "#{{base0E-hex}}", - "background": "#{{base0E-hex}}20", - "selection": "#{{base0E-hex}}30" - }, - { - "cursor": "#{{base09-hex}}", - "background": "#{{base09-hex}}20", - "selection": "#{{base09-hex}}30" - }, - { - "cursor": "#{{base0B-hex}}", - "background": "#{{base0B-hex}}20", - "selection": "#{{base0B-hex}}30" - }, - { - "cursor": "#{{base08-hex}}", - "background": "#{{base08-hex}}20", - "selection": "#{{base08-hex}}30" - }, - { - "cursor": "#{{base0A-hex}}", - "background": "#{{base0A-hex}}20", - "selection": "#{{base0A-hex}}30" - }, - { - "cursor": "#{{base0B-hex}}", - "background": "#{{base0B-hex}}20", - "selection": "#{{base0B-hex}}30" - } - ], - "syntax": { - "attribute": { - "color": "#{{base0D-hex}}", - "font_style": null, - "font_weight": null - }, - "boolean": { - "color": "#{{base0E-hex}}", - "font_style": null, - "font_weight": null - }, - "comment": { - "color": "#{{base03-hex}}", - "font_style": "italic", - "font_weight": null - }, - "comment.doc": { - "color": "#{{base03-hex}}", - "font_style": "italic", - "font_weight": 700 - }, - "constant": { - "color": "#{{base0E-hex}}", - "font_style": null, - "font_weight": null - }, - "constructor": { - "color": "#{{base0B-hex}}", - "font_style": null, - "font_weight": null - }, - "directive": { - "color": "#{{base0E-hex}}", - "font_style": null, - "font_weight": null - }, - "escape": { - "color": "#{{base0D-hex}}", - "font_style": "italic", - "font_weight": null - }, - "function": { - "color": "#{{base0D-hex}}", - "font_style": "italic", - "font_weight": null - }, - "function.decorator": { - "color": "#{{base0D-hex}}", - "font_style": "italic", - "font_weight": null - }, - "function.magic": { - "color": "#{{base0D-hex}}", - "font_style": "italic", - "font_weight": null - }, - "keyword": { - "color": "#{{base0E-hex}}", - "font_style": "italic", - "font_weight": null - }, - "label": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": null - }, - "local": { - "color": "#{{base08-hex}}", - "font_style": null, - "font_weight": null - }, - "markup": { - "color": "#{{base09-hex}}", - "font_style": null, - "font_weight": null - }, - "meta": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": null - }, - "modifier": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": null - }, - "namespace": { - "color": "#{{base08-hex}}", - "font_style": null, - "font_weight": null - }, - "number": { - "color": "#{{base0A-hex}}", - "font_style": null, - "font_weight": null - }, - "operator": { - "color": "#{{base0E-hex}}", - "font_style": null, - "font_weight": null - }, - "parameter": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": null - }, - "punctuation": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": null - }, - "regexp": { - "color": "#{{base0C-hex}}", - "font_style": null, - "font_weight": null - }, - "self": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": 700 - }, - "string": { - "color": "#{{base0B-hex}}", - "font_style": null, - "font_weight": null - }, - "strong": { - "color": "#{{base0D-hex}}", - "font_style": null, - "font_weight": 700 - }, - "support": { - "color": "#{{base0E-hex}}", - "font_style": null, - "font_weight": null - }, - "symbol": { - "color": "#{{base0A-hex}}", - "font_style": null, - "font_weight": null - }, - "tag": { - "color": "#{{base0D-hex}}", - "font_style": null, - "font_weight": null - }, - "text": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": null - }, - "type": { - "color": "#{{base0B-hex}}", - "font_style": null, - "font_weight": null - }, - "variable": { - "color": "#{{base05-hex}}", - "font_style": null, - "font_weight": null - } - }, - "terminal.background": "#00000000", - "terminal.foreground": "#{{base05-hex}}ff", - "terminal.ansi.black": "#{{base00-hex}}ff", - "terminal.ansi.red": "#{{base08-hex}}ff", - "terminal.ansi.green": "#{{base0B-hex}}ff", - "terminal.ansi.yellow": "#{{base0A-hex}}ff", - "terminal.ansi.blue": "#{{base0D-hex}}ff", - "terminal.ansi.magenta": "#{{base0E-hex}}ff", - "terminal.ansi.cyan": "#{{base0C-hex}}ff", - "terminal.ansi.white": "#{{base05-hex}}ff", - "terminal.ansi.bright_black": "#{{base03-hex}}ff", - "terminal.ansi.bright_red": "#{{base08-hex}}ff", - "terminal.ansi.bright_green": "#{{base0B-hex}}ff", - "terminal.ansi.bright_yellow": "#{{base0A-hex}}ff", - "terminal.ansi.bright_blue": "#{{base0D-hex}}ff", - "terminal.ansi.bright_magenta": "#{{base0E-hex}}ff", - "terminal.ansi.bright_cyan": "#{{base0C-hex}}ff", - "terminal.ansi.bright_white": "#{{base05-hex}}ff" - } - } - ] -} diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix index 70450b0..405e44f 100644 --- a/home-manager/users/notgne2.nix +++ b/home-manager/users/notgne2.nix @@ -27,7 +27,7 @@ in { extraPackages = with pkgs; [ package-version-server ]; userKeymaps = [ { - context = "Editor || vim_mode == normal"; + context = "vim_mode == normal"; bindings = { "tab" = "pane::ActivateNextItem"; "shift-tab" = "pane::ActivatePrevItem"; @@ -59,117 +59,6 @@ in { }; }; - programs.vscode = { - package = pkgs.vscodium; - userSettings = { - "[nix]" = { - "editor.formatOnPaste" = true; - "editor.formatOnSave" = true; - "editor.formatOnType" = false; - }; - - "window.titleBarStyle" = "custom"; - - "files.insertFinalNewline" = true; - - "alejandra.program" = "alejandra"; - - "workbench.startupEditor" = "none"; - - "editor.bracketPairColorization.enabled" = true; - "editor.guides.bracketPairs" = "active"; - - "window.menuBarVisibility" = "toggle"; - - "workbench.sideBar.location" = "right"; - - "vim.overrideCopy" = true; - "vim.useSystemClipboard" = true; - "vim.easymotion" = true; - "vim.sneak" = true; - "vim.hlsearch" = true; - "vim.ignorecase" = true; - "vim.normalModeKeyBindings" = [ - { - before = [""]; - commands = ["workbench.action.nextEditorInGroup"]; - } - { - before = [""]; - commands = ["workbench.action.previousEditorInGroup"]; - } - ]; - - "nix.formatterPath" = "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"; - "nix.enableLanguageServer" = true; - "nix.serverPath" = "${pkgs.nil}/bin/nil"; - - "editor.formatOnSave" = true; - - "elmLS.elmReviewDiagnostics" = "warning"; - - "elmLS.elmPath" = "${pkgs.elmPackages.elm}/bin/elm"; - "elmLS.elmReviewPath" = "${pkgs.elmPackages.elm-review}/bin/elm-review"; - "elmLS.elmFormatPath" = "${pkgs.elmPackages.elm-format}/bin/elm-format"; - - "rust-analyzer.diagnostics.disabled" = ["unresolved-proc-macro"]; - "rust-analyzer.checkOnSave.command" = "clippy"; - }; - extensions = with pkgs.vscode-extensions; - [ - illixion.vscode-vibrancy-continued - tamasfe.even-better-toml - vscodevim.vim - jnoortheen.nix-ide - haskell.haskell - justusadam.language-haskell - dhall.dhall-lang - dhall.vscode-dhall-lsp-server - elmtooling.elm-ls-vscode - kamadorueda.alejandra - hashicorp.terraform - serayuzgur.crates - vadimcn.vscode-lldb - (rust-lang.rust-analyzer.override { - rust-analyzer = pkgs.writeShellScriptBin "rust-analyzer" '' - exec rust-analyzer "$@" - ''; - }) - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "ide-purescript"; - publisher = "nwolverson"; - version = "0.25.11"; - sha256 = "sha256-9MgPAVfIdA7frR4EUDqVJB0N/LZY4NQSXtsKhEueNeg="; - } - { - name = "language-purescript"; - publisher = "nwolverson"; - version = "0.2.8"; - sha256 = "sha256-2uOwCHvnlQQM8s8n7dtvIaMgpW8ROeoUraM02rncH9o="; - } - { - name = "direnv"; - publisher = "mkhl"; - version = "0.6.1"; - sha256 = "sha256-5/Tqpn/7byl+z2ATflgKV1+rhdqj+XMEZNbGwDmGwLQ="; - } - { - name = "vscode-test-explorer"; - publisher = "hbenl"; - version = "2.21.1"; - sha256 = "sha256-fHyePd8fYPt7zPHBGiVmd8fRx+IM3/cSBCyiI/C0VAg="; - } - { - name = "test-adapter-converter"; - publisher = "ms-vscode"; - version = "0.1.6"; - sha256 = "sha256-UC8tUe+JJ3r8nb9SsPlvVXw74W75JWjMifk39JClRF4="; - } - ]; - }; - programs.neovim = { viAlias = true; vimAlias = true; @@ -232,42 +121,6 @@ in { ''; }; - ezpcusr.uploadScript = pkgs.writeScript "upload_file.sh" '' - #!${pkgs.zsh}/bin/zsh - fileid=$(${pkgs.pwgen}/bin/pwgen 16 1) - - extension=$(file "$1" --extension | cut -d' ' -f2 | sed 's/???/txt/') - - ssh wizbos.club "cat > ~/public/uploads/$fileid.$extension" < "$1" - echo "https://p.gen2.space/uploads/$fileid.$extension" - ''; - - stylix.fonts = lib.genAttrs ["monospace" "sansSerif" "serif"] (_: { - name = "AnonymicePro Nerd Font"; - package = pkgs.nerd-fonts.anonymice; - }) // { - sizes = lib.genAttrs ["applications" "desktop" "popups" "terminal"] (_: 11); - }; - - stylix.base16Scheme = { - base00 = "0b1c2c"; - base01 = "223b54"; - base02 = "405c79"; - base03 = "627e99"; - base04 = "aabcce"; - base05 = "cbd6e2"; - base06 = "e5ebf1"; - base07 = "f7f9fb"; - base08 = "bf8b56"; - base09 = "bfbf56"; - base0A = "8bbf56"; - base0B = "56bf8b"; - base0C = "568bbf"; - base0D = "8b56bf"; - base0E = "bf568b"; - base0F = "bf5656"; - }; - home.sessionVariables = { FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f"; }; diff --git a/modules/ezpc.nix b/modules/ezpc.nix index 1ba226a..f3106b1 100644 --- a/modules/ezpc.nix +++ b/modules/ezpc.nix @@ -38,7 +38,7 @@ in { enable = lib.mkDefault true; settings = { default_session = { - command = lib.mkDefault "${pkgs.greetd.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --cmd hyprland"; + command = lib.mkDefault "${pkgs.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --cmd hyprland"; }; }; };