From d3c3cf9ffbb9dc8c879fd8edf660daae0d0942f6 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 29 Apr 2024 23:01:08 +0200 Subject: [PATCH] removed stuff --- flake.lock | 269 ++-------------------- hosts/vali/mars/configuration.nix | 15 +- modules/gui/alacritty.nix | 42 ---- modules/gui/default.nix | 4 - modules/gui/foot.nix | 121 ---------- modules/gui/gtk.nix | 60 +++-- modules/gui/obs.nix | 22 -- modules/gui/rofi.nix | 13 +- modules/gui/schizofox.nix | 87 ------- modules/gui/vivado2.nix | 57 ----- modules/other/default.nix | 1 - modules/other/displaymanager.nix | 13 -- modules/other/xdg.nix | 45 +--- options/common/gpu/nvidia_535_wayland.nix | 59 ----- options/common/gpu/nvidia_wayland.nix | 32 --- options/desktop/fonts.nix | 2 +- 16 files changed, 69 insertions(+), 773 deletions(-) delete mode 100644 modules/gui/alacritty.nix delete mode 100644 modules/gui/foot.nix delete mode 100644 modules/gui/obs.nix delete mode 100644 modules/gui/schizofox.nix delete mode 100644 modules/gui/vivado2.nix delete mode 100644 modules/other/displaymanager.nix delete mode 100644 options/common/gpu/nvidia_535_wayland.nix delete mode 100644 options/common/gpu/nvidia_wayland.nix diff --git a/flake.lock b/flake.lock index 5f2d2b8..7043fc2 100644 --- a/flake.lock +++ b/flake.lock @@ -88,7 +88,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -146,21 +146,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -174,7 +159,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -190,7 +175,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -270,28 +255,6 @@ } }, "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -312,7 +275,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "schizofox", @@ -333,9 +296,9 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1698882062, @@ -373,24 +336,6 @@ "inputs": { "systems": "systems_3" }, - "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" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -405,9 +350,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -580,8 +525,8 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_6", - "systems": "systems_7", + "nixpkgs": "nixpkgs_4", + "systems": "systems_6", "wlroots": "wlroots", "xdph": "xdph" }, @@ -626,25 +571,6 @@ "type": "github" } }, - "lib-aggregate": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1713105314, - "narHash": "sha256-X3URKbcgIy4UaQGrsy3DmY5x+fePQ5IYaa76YewoUE0=", - "owner": "nix-community", - "repo": "lib-aggregate", - "rev": "f347ed9a1cab12c27541ed4d173e2f2d5c9bc0bb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lib-aggregate", - "type": "github" - } - }, "neovim-flake": { "inputs": { "flake-utils": "flake-utils", @@ -712,27 +638,6 @@ "type": "github" } }, - "nix-eval-jobs": { - "inputs": { - "flake-parts": "flake-parts_4", - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_4", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1705242886, - "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", - "owner": "nix-community", - "repo": "nix-eval-jobs", - "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-eval-jobs", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1693833173, @@ -748,28 +653,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701208414, - "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpak": { "inputs": { "flake-parts": [ @@ -813,21 +696,6 @@ } }, "nixpkgs-lib": { - "locked": { - "lastModified": 1713055793, - "narHash": "sha256-vIrZQykYW32RnlI2lT/gCcB59BOIqqrAmPirBdiirrc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "361d8a4f443bbfab20bd6d222f9022b8c6665906", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1698611440, @@ -845,27 +713,6 @@ "type": "github" } }, - "nixpkgs-wayland": { - "inputs": { - "flake-compat": "flake-compat_2", - "lib-aggregate": "lib-aggregate", - "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1713691001, - "narHash": "sha256-yq3AR19+XQoBhN+nY+VEfuCEnllexcnjtuFxx7Q92lY=", - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "rev": "04fd0059bcf112c76ed7e69837b5dc19bc212f14", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1713596654, @@ -899,38 +746,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1693158576, "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", @@ -949,8 +764,8 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_5", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_4", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", "nixpkgs": [ @@ -989,8 +804,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -1023,7 +838,6 @@ "home-manager": "home-manager_2", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_3", - "nixpkgs-wayland": "nixpkgs-wayland", "nixvim": "nixvim", "nur": "nur", "schizofox": "schizofox", @@ -1049,15 +863,15 @@ }, "schizofox": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_6", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_5", "home-manager": "home-manager_4", "nixpak": "nixpak", "nixpkgs": [ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1713551575, @@ -1076,7 +890,7 @@ "searx-randomizer": { "inputs": { "crane": "crane", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "nixpkgs": [ "schizofox", "nixpkgs" @@ -1177,16 +991,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1205,43 +1019,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702979157, - "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "2961375283668d867e64129c22af532de8e77734", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index fc405d1..f16fe3f 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -23,6 +23,7 @@ security.sudo.package = pkgs.sudo.override { withInsults = true; }; security.polkit.enable = true; programs.kdeconnect.enable = true; + programs.dconf.enable = true; modules = { other = { system = { @@ -63,17 +64,17 @@ }; gtk = { enable = false; - package = pkgs.gruvbox-gtk-theme; - name = "Gruvbox-Dark-BL"; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders; - }; + package = pkgs.materia-theme; + name = "Materia-dark"; + # iconTheme = { + # name = "Papirus-Dark"; + # package = pkgs.catppuccin-papirus-folders; + # }; }; qt = { enable = true; package = pkgs.kde-gruvbox; - name = "Gruvbox"; + name = "Gruvbox-Dark"; }; }; }; diff --git a/modules/gui/alacritty.nix b/modules/gui/alacritty.nix deleted file mode 100644 index fcafa8b..0000000 --- a/modules/gui/alacritty.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, lib, inputs, pkgs, ... }: -with lib; let - username = config.modules.other.system.username; - cfg = config.modules.programs.alacritty; -in { - options.modules.programs.alacritty = { - enable = mkEnableOption "alacritty"; - catppuccin = mkEnableOption "catppuccin"; - opacity = mkOption { - description = "opacity of alacritty"; - type = types.number; - default = 1.0; - }; - blur = mkOption { - description = "blur of alacritty"; - type = types.bool; - default = false; - }; - }; - - config = mkIf cfg.enable { - home-manager.users.${username} = { - programs.alacritty.enable = true; - - programs.alacritty.settings = { - window = { - blur = cfg.blur; - opacity = cfg.opacity; - }; - - colors = mkIf cfg.catppuccin { - primary = { - background = "#1e1e2e"; - foreground = "#cdd6f4"; - dim_foreground = "#7f849c"; - bright_foreground = "#cdd6f4"; - }; - }; - }; - }; - }; -} diff --git a/modules/gui/default.nix b/modules/gui/default.nix index 555f33b..f7eb384 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -5,15 +5,11 @@ _: { ./gtk.nix ./mpv.nix ./qt.nix - ./schizofox.nix ./zathura.nix - ./obs.nix - ./foot.nix ./rofi.nix ./WM ./kitty.nix ./vivado.nix - ./alacritty.nix ./firefox.nix ./steam.nix ./minecraft.nix diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix deleted file mode 100644 index 6d72aab..0000000 --- a/modules/gui/foot.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - config, - inputs, - lib, - pkgs, - ... -}: with lib; let - cfg = config.modules.programs.foot; - username = config.modules.other.system.username; -in { - options.modules.programs.foot = { - enable = mkEnableOption "foot"; - server = mkEnableOption "foot server mode"; - }; - - config = mkIf cfg.enable { - environment.sessionVariables = { - TERM = "foot"; - }; - home-manager.users.${username} = { - programs.foot = { - enable = true; - package = inputs.nixpkgs-wayland.packages.${pkgs.system}.foot; - server.enable = cfg.server; - settings = { - main = { - term = "foot"; - app-id = "foot"; - title = "foot"; - locked-title = "no"; - - font = "JetBrains Mono Nerd Font:size=16"; - line-height = 20; - letter-spacing = 0; - horizontal-letter-offset = 0; - vertical-letter-offset = -0.75; - box-drawings-uses-font-glyphs = "no"; - dpi-aware = "no"; - - initial-window-size-chars = "104x36"; - initial-window-mode = "windowed"; - pad = "5x5 center"; - resize-delay-ms = 100; - - notify = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}"; - - bold-text-in-bright = "no"; - word-delimiters = ",│`|:\"'()[]{}<>"; - selection-target = "primary"; - }; - bell = { - urgent = "yes"; - notify = "yes"; - command = "notify-send bell"; - command-focused = "no"; - }; - scrollback = { - lines = 100000; - multiplier = 10.0; - indicator-position = "relative"; - indicator-format = "line"; - }; - url = { - launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}"; - label-letters = "sadfjklewcmpgh"; - osc8-underline = "always"; - protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs"; - uri-characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+=\"'()[]"; - }; - cursor = { - style = "block"; - blink = "no"; - }; - mouse = { - hide-when-typing = "yes"; - alternate-scroll-mode = "yes"; - }; - colors = { - alpha = 0.85; - foreground = "cdd6f4"; # Text - background = "1e1e2e"; # Base - regular0 = "45475a"; # Surface 1 - regular1 = "f38ba8"; # red - regular2 = "a6e3a1"; # green - regular3 = "f9e2af"; # yellow - regular4 = "89b4fa"; # blue - regular5 = "f5c2e7"; # pink - regular6 = "94e2d5"; # teal - regular7 = "bac2de"; # Subtext 1 - bright0 = "585b70"; # Surface 2 - bright1 = "f38ba8"; # red - bright2 = "a6e3a1"; # green - bright3 = "f9e2af"; # yellow - bright4 = "89b4fa"; # blue - bright5 = "f5c2e7"; # pink - bright6 = "94e2d5"; # teal - bright7 = "a6adc8"; # Subtext 0 - }; - csd = { - preferred = "server"; - }; - key-bindings = { - show-urls-launch = "Control+Shift+u"; - unicode-input = "Control+Shift+i"; - }; - mouse-bindings = { - selection-override-modifiers = "Shift"; - primary-paste = "BTN_MIDDLE"; - select-begin = "BTN_LEFT"; - select-begin-block = "Control+BTN_LEFT"; - select-extend = "BTN_RIGHT"; - select-extend-character-wise = "Control+BTN_RIGHT"; - select-word = "BTN_LEFT-2"; - select-word-whitespace = "Control+BTN_LEFT-2"; - #select-row = "BTN_LEFT-3"; - }; - }; - }; - }; - }; -} diff --git a/modules/gui/gtk.nix b/modules/gui/gtk.nix index 780ce09..feede0a 100644 --- a/modules/gui/gtk.nix +++ b/modules/gui/gtk.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: with lib; let cfg = config.modules.themes.gtk; @@ -13,33 +14,25 @@ in { description = "gtk theme name"; type = types.str; }; - variant = mkOption { - description = "gtk theme variant"; - type = types.str; - }; - accentColour = mkOption { - description = "accent colour for gtk theme"; - type = types.str; - }; package = mkOption { description = "gtk theme package"; type = types.package; }; - iconTheme = mkOption { - description = "gtk icon theme"; - type = with types; submodule { - options = { - name = mkOption { - description = "gtk icon theme name"; - type = str; - }; - package = mkOption { - description = "gtk icon theme package"; - type = package; - }; - }; - }; - }; + # iconTheme = mkOption { + # description = "gtk icon theme"; + # type = with types; submodule { + # options = { + # name = mkOption { + # description = "gtk icon theme name"; + # type = str; + # }; + # package = mkOption { + # description = "gtk icon theme package"; + # type = package; + # }; + # }; + # }; + # }; }; config = mkIf cfg.enable { @@ -47,19 +40,18 @@ in { gtk = { enable = true; theme = { - inherit (cfg) name package; - }; - iconTheme = { - inherit (cfg.iconTheme) name package; - }; - gtk2 = { - configLocation = "${hmCfg.xdg.configHome}/gtk-2.0/gtkrc"; + # inherit (cfg) name package; + package = pkgs.materia-theme; + name = "Materia-dark"; }; + # iconTheme = { + # inherit (cfg.iconTheme) name package; + # }; }; - home.sessionVariables = { - GTK_THEME = cfg.name; - GTK_USE_PORTAL = "1"; - }; + # home.sessionVariables = { + # GTK_THEME = cfg.name; + # GTK_USE_PORTAL = "1"; + # }; }; }; } diff --git a/modules/gui/obs.nix b/modules/gui/obs.nix deleted file mode 100644 index f979cfb..0000000 --- a/modules/gui/obs.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; let - cfg = config.modules.programs.obs; - username = config.modules.other.system.username; -in { - options.modules.programs.obs.enable = mkEnableOption "obs"; - - config = mkIf cfg.enable { - home-manager.users.${username} = { - programs.obs-studio = { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-backgroundremoval - obs-pipewire-audio-capture - ]; - - }; - }; - }; - -} diff --git a/modules/gui/rofi.nix b/modules/gui/rofi.nix index 70fce84..3fe61e7 100644 --- a/modules/gui/rofi.nix +++ b/modules/gui/rofi.nix @@ -4,19 +4,10 @@ with lib; let username = config.modules.other.system.username; cfg = config.modules.programs.rofi; -in -{ +in { options.modules.programs.rofi.enable = mkEnableOption "rofi"; - options.modules.other.system.wayland = mkOption { - type = types.bool; - description = "Does this system use wayland?"; - default = false; - }; #FIXME: move this to the (hopefully then) refactored options directory - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - (if config.modules.other.system.wayland then rofi-wayland else rofi) - ]; + environment.systemPackages = with pkgs; [ rofi ]; }; } diff --git a/modules/gui/schizofox.nix b/modules/gui/schizofox.nix deleted file mode 100644 index 07cdc5b..0000000 --- a/modules/gui/schizofox.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ config, inputs, lib, ... }: -with lib; let - cfg = config.modules.programs.schizofox; - username = config.modules.other.system.username; -in { - options.modules.programs.schizofox = { - enable = mkEnableOption "schizofox"; - }; - - config = mkIf cfg.enable { - home-manager.users.${username} = { - imports = [ inputs.schizofox.homeManagerModule ]; - programs.schizofox = { - enable = true; - - theme = { - colors = { - background-darker = "181825"; - background = "1e1e2e"; - foreground = "cdd6f4"; - }; - - font = "Lexend"; - - extraUserChrome = '' - body { - color: red !important; - } - ''; - }; - - search = { - defaultSearchEngine = "Brave"; - removeEngines = ["Google" "Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia"]; - searxUrl = "https://searx.be"; - searxQuery = "https://searx.be/search?q={searchTerms}&categories=general"; - addEngines = [ - { - Name = "NixOS Packages"; - Description = "NixOS Unstable package serach"; - Alias = "!np"; - Method = "GET"; - URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}"; - } - { - Name = "Home Manager Options"; - Description = "Home Manager option search"; - Alias = "!hm"; - Method = "GET"; - URLTemplate = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}"; - } - - ]; - }; - - security = { - sanitizeOnShutdown = false; - sandbox = true; - userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0"; - }; - - misc = { - drmFix = true; - disableWebgl = false; - }; - - extensions = { - simplefox.enable = true; - darkreader.enable = true; - - extraExtensions = { - }; - }; - - bookmarks = [ - { - Title = "Example"; - URL = "https://example.com"; - Favicon = "https://example.com/favicon.ico"; - Placement = "toolbar"; - Folder = "FolderName"; - } - ]; - }; - }; - }; -} diff --git a/modules/gui/vivado2.nix b/modules/gui/vivado2.nix deleted file mode 100644 index 7201008..0000000 --- a/modules/gui/vivado2.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ config, lib, pkgs, ...}: - -with lib; -let - vivado-desktop-symbol = pkgs.makeDesktopItem { - name = "vivado-2022_2"; - desktopName = "Vivado"; - exec = "${pkgs.nur.repos.lschuermann.vivado-2022_2}/bin/vivado"; - }; - cfg = config.modules.programs.vivado; - username = config.modules.other.system.username; -in -{ - options.modules.programs.vivado.enable = mkEnableOption "vivado"; - - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - # this propietary software is huge, but I need it for - # university - pkgs.nur.repos.lschuermann.vivado-2022_2 - vivado-desktop-symbol - ]; - - - # Create udev rules. Reference: https://blog.kotatsu.dev/posts/2021-09-14-vivado-on-nixos/ - services.udev.packages = [ - (pkgs.writeTextFile { - name = "xilinx-dilligent-usb-udev"; - destination = "/etc/udev/rules.d/52-xilinx-digilent-usb.rules"; - text = '' - ATTR{idVendor}=="1443", MODE:="666" - ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", MODE:="666" - ''; - }) - (pkgs.writeTextFile { - name = "xilinx-pcusb-udev"; - destination = "/etc/udev/rules.d/52-xilinx-pcusb.rules"; - text = '' - ATTR{idVendor}=="03fd", ATTR{idProduct}=="0008", MODE="666" - ATTR{idVendor}=="03fd", ATTR{idProduct}=="0007", MODE="666" - ATTR{idVendor}=="03fd", ATTR{idProduct}=="0009", MODE="666" - ATTR{idVendor}=="03fd", ATTR{idProduct}=="000d", MODE="666" - ATTR{idVendor}=="03fd", ATTR{idProduct}=="000f", MODE="666" - ATTR{idVendor}=="03fd", ATTR{idProduct}=="0013", MODE="666" - ATTR{idVendor}=="03fd", ATTR{idProduct}=="0015", MODE="666" - ''; - }) - (pkgs.writeTextFile { - name = "xilinx-ftdi-usb-udev"; - destination = "/etc/udev/rules.d/52-xilinx-ftdi-usb.rules"; - text = '' - ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666" - ''; - }) - ]; - }; -} diff --git a/modules/other/default.nix b/modules/other/default.nix index dc00064..fa98cba 100644 --- a/modules/other/default.nix +++ b/modules/other/default.nix @@ -3,7 +3,6 @@ _: { ./home-manager.nix ./system.nix ./xdg.nix - ./displaymanager.nix ]; } diff --git a/modules/other/displaymanager.nix b/modules/other/displaymanager.nix deleted file mode 100644 index 02f3ffe..0000000 --- a/modules/other/displaymanager.nix +++ /dev/null @@ -1,13 +0,0 @@ -{pkgs, lib, config, ...}: -with lib; let - cfg = config.modules.programs.displaymanager; -in { - options.modules.programs.displaymanager.enable = mkEnableOption "displaymanager"; - - config = mkIf cfg.enable { - services.xserver.displayManager = { - gdm.enable = true; - defaultSession = "none+i3"; - }; - }; -} diff --git a/modules/other/xdg.nix b/modules/other/xdg.nix index cf511dc..a246ef3 100644 --- a/modules/other/xdg.nix +++ b/modules/other/xdg.nix @@ -1,11 +1,9 @@ -{ - pkgs, config, - ... -}: let +{ pkgs, config, ... }: +let username = config.modules.other.system.username; hmCfg = config.home-manager.users.${username}; - primary_browser = "schizofox.desktop"; + primary_browser = "librewolf.desktop"; mail_client = "thunderbird.desktop"; file_manager = "pcmanfm.desktop"; media_player = "mpv.desktop"; @@ -14,46 +12,21 @@ terminal = "kitty.desktop"; in { -/* environment.sessionVariables = { - CARGO_HOME = "${hmCfg.xdg.dataHome}/cargo"; - GOPATH = "${hmCfg.xdg.dataHome}/go"; - GNUPGHOME = "${hmCfg.xdg.dataHome}/gnupg"; - GRADLE_USER_HOME = "${hmCfg.xdg.dataHome}/gradle"; - HISTFILE = "${hmCfg.xdg.stateHome}/bash/history"; - MYSQL_HISTFILE = "${hmCfg.xdg.stateHome}/mysql/history"; - NPM_CONFIG_USERCONFIG = "${hmCfg.xdg.configHome}/npm/npmrc"; - NUGET_PACKAGES = "${hmCfg.xdg.cacheHome}/NuGetPackages"; - JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${hmCfg.xdg.configHome}/java"; - PARALLEL_HOME = "${hmCfg.xdg.configHome}/parallel"; - PYTHONSTARTUP = "${hmCfg.xdg.configHome}/python/pythonrc"; - RUSTUP_HOME = "${hmCfg.xdg.dataHome}/rustup"; - WINEPREFIX = "${hmCfg.xdg.dataHome}/wine"; - XAUTHORITY = "\$XDG_RUNTIME_DIR/Xauthority"; - }; -*/ xdg.portal = { enable = true; - config = { - common.default = "gtk"; - }; + extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + config.common.default = "gtk"; }; environment.sessionVariables = { TERMINAL = "${terminal}"; }; home-manager.users.${username} = { - xdg.configFile."npm/npmrc".text = '' - prefix=${hmCfg.xdg.dataHome}/npm - cache=${hmCfg.xdg.cacheHome}/npm - tmp=\$XDG_RUNTIME_DIR/npm - init-module=${hmCfg.xdg.configHome}/npm/config/npm-init.js - ''; - xdg = { - cacheHome = "${hmCfg.home.homeDirectory}/.cache"; - configHome = "${hmCfg.home.homeDirectory}/.config"; - dataHome = "${hmCfg.home.homeDirectory}/.local/share"; - stateHome = "${hmCfg.home.homeDirectory}/.local/state"; +# cacheHome = "${hmCfg.home.homeDirectory}/.cache"; +# configHome = "${hmCfg.home.homeDirectory}/.config"; +# dataHome = "${hmCfg.home.homeDirectory}/.local/share"; +# stateHome = "${hmCfg.home.homeDirectory}/.local/state"; mimeApps = { enable = true; defaultApplications = { diff --git a/options/common/gpu/nvidia_535_wayland.nix b/options/common/gpu/nvidia_535_wayland.nix deleted file mode 100644 index 30108f4..0000000 --- a/options/common/gpu/nvidia_535_wayland.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ pkgs, config, libs, ... }: - -{ - - environment.variables = { - GBM_BACKEND = "nvidia-drm"; - WLR_NO_HARDWARE_CURSORS = "1"; - LIBVA_DRIVER_NAME = "nvidia"; - __GLX_VENDOR_LIBRARY_NAME = "nvidia"; - }; - - environment.systemPackages = with pkgs; [ - vulkan-loader - vulkan-validation-layers - vulkan-tools - ]; - -# Enable OpenGL - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ nvidia-vaapi-driver ]; - }; - -# Load nvidia driver for Xorg and Wayland - services.xserver.videoDrivers = ["nvidia"]; - - hardware.nvidia.modesetting.enable = true; - hardware.nvidia.powerManagement.enable = false; - hardware.nvidia.powerManagement.finegrained = false; - hardware.nvidia.open = false; - hardware.nvidia.nvidiaSettings = true; - hardware.nvidia.forceFullCompositionPipeline = false; - # package = config.boot.kernelPackages.nvidiaPackages.beta; -# Special config to load the latest (535 or 550) driver for the support of the 4070 SUPER - hardware.nvidia.package = let - rcu_patch = pkgs.fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; - hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; - }; - in config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "535.154.05"; - sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; - sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k="; - openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; - settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; - persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; - - #version = "550.40.07"; - #sha256_64bit = "sha256-KYk2xye37v7ZW7h+uNJM/u8fNf7KyGTZjiaU03dJpK0="; - #sha256_aarch64 = "sha256-AV7KgRXYaQGBFl7zuRcfnTGr8rS5n13nGUIe3mJTXb4="; - #openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I="; - #settingsSha256 = "sha256-c30AQa4g4a1EHmaEu1yc05oqY01y+IusbBuq+P6rMCs="; - #persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870="; - - patches = [ rcu_patch ]; - }; -} diff --git a/options/common/gpu/nvidia_wayland.nix b/options/common/gpu/nvidia_wayland.nix deleted file mode 100644 index 2dcd218..0000000 --- a/options/common/gpu/nvidia_wayland.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, lib, pkgs, ...}: -{ - services.xserver.videoDrivers = [ "nvidia" ]; - environment.variables = { - GBM_BACKEND = "nvidia-drm"; - WLR_NO_HARDWARE_CURSORS = "1"; - LIBVA_DRIVER_NAME = "nvidia"; - __GLX_VENDOR_LIBRARY_NAME = "nvidia"; - }; - environment.systemPackages = with pkgs; [ - vulkan-loader - vulkan-validation-layers - vulkan-tools - ]; - hardware = { - nvidia = { - open = true; - nvidiaSettings = false; - powerManagement.enable = true; - powerManagement.finegrained = false; - modesetting.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; - }; - }; - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ nvidia-vaapi-driver ]; - }; -} - diff --git a/options/desktop/fonts.nix b/options/desktop/fonts.nix index 247c40d..7cdde28 100644 --- a/options/desktop/fonts.nix +++ b/options/desktop/fonts.nix @@ -3,7 +3,7 @@ fonts.packages = with pkgs; [ material-design-icons (nerdfonts.override { - # fonts = [ "JetBrains Mono"]; + # fonts = [ "JetBrains Mono"]; }) noto-fonts noto-fonts-cjk-sans