merge changes from main

9 files changed, 0 insertions, 553 deletions

diff --git a/modules/desktop/system/components/dunst.nix b/modules/desktop/system/components/dunst.nix
deleted file mode 100644
index 1069087..0000000
--- a/modules/desktop/system/components/dunst.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.collinux.desktop.components.dunst;
-
-  settings = ''
-    [global]
-      frame_color = "#89b4fa"
-      separator_color = frame
-      highlight = "#89b4fa"
-      offset = "(8,8)"
-      origin = "top-right"
-      transparency = 10
-      font = "Iosevka Nerd Font"
-
-    [urgency_low]
-      background = "#1e1e2e"
-      foreground = "#cdd6f4"
-
-    [urgency_normal]
-      background = "#1e1e2e"
-      foreground = "#cdd6f4"
-
-    [urgency_critical]
-      background = "#1e1e2e"
-      foreground = "#cdd6f4"
-      frame_color = "#fab387"
-  '';
-in
-  lib.mkIf cfg.enable {
-    hjem.users."${config.collinux.user.name}" = {
-      files.".config/dunst/dunstrc".text = settings;
-      packages = [pkgs.dunst pkgs.inotify-tools];
-    };
-  }
diff --git a/modules/desktop/system/components/fuzzel.nix b/modules/desktop/system/components/fuzzel.nix
deleted file mode 100644
index f5937c6..0000000
--- a/modules/desktop/system/components/fuzzel.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.collinux.desktop.components.fuzzel;
-  ini' = pkgs.formats.ini {};
-
-  settings = ini'.generate "fuzzel.ini" {
-    main = {
-      prompt = "    ";
-      dpi-aware = false;
-
-      font = "Iosevka Nerd Font";
-      line-height = 25;
-      lines = 10;
-      width = 30;
-
-      horizontal-pad = 8;
-      vertical-pad = 8;
-    };
-    border = {
-      radius = 0;
-      width = 2;
-    };
-
-    colors = {
-      background = "1e1e2edd";
-      text = "cdd6f4ff";
-      prompt = "bac2deff";
-      placeholder = "7f849cff";
-      input = "cdd6f4ff";
-      match = "89b4faff";
-      selection = "585b70ff";
-      selection-text = "cdd6f4ff";
-      selection-match = "89b4faff";
-      counter = "7f849cff";
-      border = "89b4faff";
-    };
-  };
-in
-  lib.mkIf cfg.enable {
-    hjem.users."${config.collinux.user.name}" = {
-      files = {
-        ".config/fuzzel/fuzzel.ini".source = settings;
-      };
-      packages = [pkgs.fuzzel];
-    };
-  }
diff --git a/modules/desktop/system/default.nix b/modules/desktop/system/default.nix
deleted file mode 100644
index 8827070..0000000
--- a/modules/desktop/system/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{...}: {
-  imports = [
-    ./environments/gnome.nix
-    ./environments/sway.nix
-
-    ./programs/firefox.nix
-    ./programs/foot.nix
-    ./programs/blackbox.nix
-    ./programs/alacritty.nix
-
-    ./components/fuzzel.nix
-    ./components/dunst.nix
-  ];
-}
diff --git a/modules/desktop/system/environments/gnome.nix b/modules/desktop/system/environments/gnome.nix
deleted file mode 100644
index e298756..0000000
--- a/modules/desktop/system/environments/gnome.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.gnome;
-in
-  lib.mkIf cfg.enable {
-    services.displayManager.gdm = {
-      enable = true;
-      wayland = true;
-    };
-    services.desktopManager.gnome.enable = true;
-
-    environment.gnome.excludePackages = with pkgs; [
-      orca
-      evince
-      file-roller
-      geary
-      gnome-disk-utility
-      seahorse
-      # sushi
-      # sysprof
-      # gnome-shell-extensions
-      adwaita-icon-theme
-      # nixos-background-info
-      gnome-backgrounds
-      # gnome-bluetooth
-      # gnome-color-manager
-      # gnome-control-center
-      # gnome-shell-extensions
-      gnome-tour # GNOME Shell detects the .desktop file on first log-in.
-      gnome-user-docs
-      # glib # for gsettings program
-      # gnome-menus
-      # gtk3.out # for gtk-launch program
-      # xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-      # xdg-user-dirs-gtk # Used to create the default bookmarks
-      #
-      baobab
-      epiphany
-      gnome-text-editor
-      gnome-calculator
-      gnome-calendar
-      gnome-characters
-      # gnome-clocks
-      gnome-console
-      gnome-contacts
-      gnome-font-viewer
-      gnome-logs
-      gnome-maps
-      gnome-music
-      # gnome-system-monitor
-      gnome-weather
-      # loupe
-      # nautilus
-      gnome-connections
-      simple-scan
-      snapshot
-      totem
-      yelp
-      gnome-software
-    ];
-
-    hjem.users."${config.collinux.user.name}".packages = with pkgs.gnomeExtensions; [blur-my-shell dash-to-dock];
-
-    programs.dconf = {
-      enable = true;
-      profiles.user.databases = [
-        {
-          settings = {
-            "org/gnome/mutter" = {
-              workspaces-only-on-primary = false;
-            };
-            "org/gnome/shell/app-switcher" = {
-              current-workspace-only = true;
-            };
-
-            # Idle settings
-            "org/gnome/desktop/session" = {
-              idle-delay = lib.gvariant.mkInt16 0;
-            };
-            "org/gnome/settings-daemon/plugins/power" = {
-              sleep-inactive-ac-type = "nothing";
-            };
-
-            # Keybindings
-            "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-              binding = "<Super>Return";
-              command = "blackbox";
-              name = "Terminal";
-            };
-            "org/gnome/settings-daemon/plugins/media-keys" = {
-              custom-keybindings = [
-                "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-              ];
-            };
-
-            # Background
-            "org/gnome/desktop/background" = rec {
-              picture-uri = "file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/blobs-d.svg";
-              picture-uri-dark = picture-uri;
-            };
-
-            # Extensions
-            "org/gnome/shell" = {
-              disable-user-extensions = false;
-              enabled-extensions = with pkgs.gnomeExtensions; [
-                blur-my-shell.extensionUuid
-                dash-to-dock.extensionUuid
-              ];
-            };
-
-            "org/gnome/shell/extensions/dash-to-dock" = {
-              dash-max-icon-size = lib.gvariant.mkInt16 48;
-              show-trash = false;
-              show-mounts = false;
-            };
-          };
-        }
-      ];
-    };
-  }
diff --git a/modules/desktop/system/environments/sway.nix b/modules/desktop/system/environments/sway.nix
deleted file mode 100644
index 4ea3378..0000000
--- a/modules/desktop/system/environments/sway.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.sway;
-
-  colors = ''
-    set $rosewater #f5e0dc
-    set $flamingo #f2cdcd
-    set $pink #f5c2e7
-    set $mauve #cba6f7
-    set $red #f38ba8
-    set $maroon #eba0ac
-    set $peach #fab387
-    set $yellow #f9e2af
-    set $green #a6e3a1
-    set $teal #94e2d5
-    set $sky #89dceb
-    set $sapphire #74c7ec
-    set $blue #89b4fa
-    set $lavender #b4befe
-    set $text #cdd6f4
-    set $subtext1 #bac2de
-    set $subtext0 #a6adc8
-    set $overlay2 #9399b2
-    set $overlay1 #7f849c
-    set $overlay0 #6c7086
-    set $surface2 #585b70
-    set $surface1 #45475a
-    set $surface0 #313244
-    set $base #1e1e2e
-    set $mantle #181825
-    set $crust #11111b
-  '';
-
-  settings = ''
-    exec ${pkgs.foot}/bin/foot --server
-    exec ${pkgs.swaybg}/bin/swaybg -i ${config.collinux.desktop.wallpaper}
-    exec ${pkgs.dunst}/bin/dunst
-
-    include catppuccin-mocha
-
-    # target                 title     bg    text   indicator  border
-    client.focused           $lavender $base $text  $rosewater $lavender
-    client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
-    client.unfocused         $overlay0 $base $text  $rosewater $overlay0
-    client.urgent            $peach    $base $peach $overlay0  $peach
-    client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
-    client.background        $base
-
-    input type:keyboard {
-      xkb_options caps:none
-    }
-
-    bindsym Mod4+1 workspace number 1
-    bindsym Mod4+2 workspace number 2
-    bindsym Mod4+3 workspace number 3
-    bindsym Mod4+4 workspace number 4
-    bindsym Mod4+Shift+1 move container to workspace number 1
-    bindsym Mod4+Shift+2 move container to workspace number 2
-    bindsym Mod4+Shift+3 move container to workspace number 3
-    bindsym Mod4+Shift+4 move container to workspace number 4
-
-    bindsym Mod4+Return exec "${pkgs.foot}/bin/footclient"
-    bindsym Mod4+Shift+Return exec ${pkgs.foot}/bin/foot
-    bindsym Mod4+Space exec ${pkgs.fuzzel}/bin/fuzzel
-    bindsym Mod4+b exec ${pkgs.firefox}/bin/firefox
-    bindsym Mod4+Shift+b exec ${pkgs.qutebrowser}/bin/qutebrowser
-    bindsym Mod4+q kill
-
-    bindsym XF86AudioRaiseVolume  exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | bc)"'
-    bindsym XF86AudioLowerVolume  exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | bc)"'
-
-    bindsym XF86MonBrightnessUp   exec 'brightnessctl set 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:brightness "Brightness: " -h "int:value:$(g=$(brightnessctl get);m=$(brightnessctl max);echo $((g * 100 / m)))"'
-    bindsym XF86MonBrightnessDown exec 'brightnessctl set 5%-; dunstify -t 300 -h string:x-canonical-private-synchronous:brightness "Brightness: " -h "int:value:$(g=$(brightnessctl get);m=$(brightnessctl max);echo $((g * 100 / m)))"'
-
-    default_border pixel 2
-    smart_borders on
-    smart_gaps on
-  '';
-in
-  lib.mkIf cfg.enable {
-    hjem.users."${config.collinux.user.name}" = {
-      files = {
-        ".config/sway/config".text = settings;
-        ".config/sway/catppuccin-mocha".text = colors;
-      };
-
-      packages = [pkgs.sway pkgs.bc pkgs.brightnessctl];
-    };
-
-    # Greetd
-    services.greetd = {
-      enable = true;
-      settings = rec {
-        initial_session = {
-          command = "${pkgs.sway}/bin/sway";
-          user = config.collinux.user.name;
-        };
-        default_session = initial_session;
-      };
-    };
-  }
diff --git a/modules/desktop/system/programs/alacritty.nix b/modules/desktop/system/programs/alacritty.nix
deleted file mode 100644
index f73a901..0000000
--- a/modules/desktop/system/programs/alacritty.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.alacritty;
-in
-  lib.mkIf cfg.enable {
-    hjem.users."${config.collinux.user.name}" = {
-      files.".config/alacritty/alacritty.toml" = {
-        value = {
-          general = {
-            import = ["keys.toml" "colors.toml"];
-            live_config_reload = true;
-          };
-          font = {
-            normal.family = "Iosevka Nerd Font";
-            size = 12;
-          };
-        };
-        generator = (pkgs.formats.toml {}).generate "alacritty.toml";
-      };
-
-      files.".config/alacritty/colors.toml".text = ''
-        [colors]
-        draw_bold_text_with_bright_colors = false
-
-        # Default colors
-        [colors.primary]
-        background = '#242424'
-        foreground = '#C5C6C5'
-
-        # Colors the cursor will use if `custom_cursor_colors` is true
-        [colors.cursor]
-        text = '#2D3234'
-        cursor = '#C5C6C5'
-
-        # Normal colors
-        [colors.normal]
-        black = '#2D3234'
-        red = '#FFA500'
-        green = '#6FEE91'
-        yellow = '#91EE6F'
-        blue = '#916FB4'
-        magenta = '#EE6F91'
-        cyan = '#6F91B4'
-        white = '#C5C6C5'
-
-        # Bright colors
-        [colors.bright]
-        black = '#566164'
-        red = '#FFFF60'
-        green = '#33393B'
-        yellow = '#4B5356'
-        blue = '#919494'
-        magenta = '#D3D4D5'
-        cyan = '#EE6F6F'
-        white = '#EEEEEC'
-      '';
-
-      files.".config/alacritty/keys.toml".text = ''
-        [[keyboard.bindings]]
-        chars = "\u001b[27;5;9~"
-        key = "Tab"
-        mods = "Control"
-
-        [[keyboard.bindings]]
-        chars = "\u001b[27;5;13~"
-        key = "Enter"
-        mods = "Control"
-      '';
-
-      packages = [pkgs.alacritty];
-    };
-  }
diff --git a/modules/desktop/system/programs/blackbox.nix b/modules/desktop/system/programs/blackbox.nix
deleted file mode 100644
index 9cff44a..0000000
--- a/modules/desktop/system/programs/blackbox.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.blackbox;
-in
-  lib.mkIf cfg.enable {
-    programs.dconf.profiles.user.databases = [
-      {
-        settings = {
-          "com/raggesilver/BlackBox" = {
-            context-aware-header-bar = true;
-            fill-tabs = true;
-            notify-process-completion = true;
-            opacity = lib.gvariant.mkInt16 100;
-            pixel-scrolling = true;
-            pretty = true;
-            show-scrollbars = false;
-            terminal-padding = lib.gvariant.mkTuple (builtins.map lib.gvariant.mkInt16 [10 10 10 10]);
-
-            font = "Iosevka Nerd Font 12";
-
-            floating-controls = false;
-            show-headerbar = true;
-          };
-        };
-      }
-    ];
-
-    hjem.users."${config.collinux.user.name}".packages = [pkgs.blackbox-terminal];
-  }
diff --git a/modules/desktop/system/programs/firefox.nix b/modules/desktop/system/programs/firefox.nix
deleted file mode 100644
index 7f4435b..0000000
--- a/modules/desktop/system/programs/firefox.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.firefox;
-in
-  lib.mkIf cfg.enable {
-    programs.firefox = {
-      enable = true;
-      policies = {
-        PasswordManagerEnabled = false; # use bitwarden instead
-        DisableAccounts = true;
-        DisablePocket = true;
-
-        OverrideFirstRunPage = "";
-        OverridePostUpdatePage = "";
-
-        ExtensionSettings = let
-          ext = name: {
-            installation_mode = "force_installed";
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi";
-          };
-        in
-          lib.mkMerge [
-            {
-              "{446900e4-71c2-419f-a6a7-df9c091e268b}" = ext "bitwarden-password-manager";
-              "uBlock0@raymondhill.net" = ext "uBlock0@raymondhill.net";
-            }
-            (lib.mkIf (cfg.theme == "catppuccin") {
-              "{88b098c8-19be-421e-8ffa-85ddd1f3f004}" = ext "catppuccin-mocha-blue";
-            })
-          ];
-      };
-    };
-
-    hjem.users."${config.collinux.user.name}".files = {
-      ".mozilla/firefox/profiles.ini".text = ''
-        [Profile0]
-        Name=collin
-        IsRelative=1
-        Path=collin
-        Default=1
-
-        [General]
-        StartWithLastProfile=1
-        Version=2
-      '';
-    };
-  }
diff --git a/modules/desktop/system/programs/foot.nix b/modules/desktop/system/programs/foot.nix
deleted file mode 100644
index 1b99ce3..0000000
--- a/modules/desktop/system/programs/foot.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.foot;
-
-  settings = {
-    main = {
-      font = "Iosevka Nerd Font:size=12";
-      shell = "${pkgs.fish}/bin/fish";
-    };
-
-    colors = {
-      foreground = "cdd6f4";
-      background = "1e1e2e";
-      cursor = "11111b f5e0dc";
-
-      regular0 = "45475a";
-      regular1 = "f38ba8";
-      regular2 = "a6e3a1";
-      regular3 = "f9e2af";
-      regular4 = "89b4fa";
-      regular5 = "f5c2e7";
-      regular6 = "94e2d5";
-      regular7 = "bac2de";
-
-      bright0 = "585b70";
-      bright1 = "f38ba8";
-      bright2 = "a6e3a1";
-      bright3 = "f9e2af";
-      bright4 = "89b4fa";
-      bright5 = "f5c2e7";
-      bright6 = "94e2d5";
-      bright7 = "a6adc8";
-
-      "16" = "fab387";
-      "17" = "f5e0dc";
-
-      selection-foreground = "cdd6f4";
-      selection-background = "414356";
-
-      search-box-no-match = "11111b f38ba8";
-      search-box-match = "cdd6f4 313244";
-
-      jump-labels = "11111b fab387";
-      urls = "89b4fa";
-    };
-  };
-in
-  lib.mkIf cfg.enable {
-    hjem.users."${config.collinux.user.name}" = {
-      files = {
-        ".config/foot/foot.ini" = {
-          generator = lib.generators.toINI {};
-          value = settings;
-        };
-      };
-
-      packages = [pkgs.foot];
-    };
-  }