monitor mirroring

common/default.nix

@@ -39,11 +39,13 @@
         "https://nix-community.cachix.org"
         "https://nixpkgs-review-bot.cachix.org"
         "https://cachix.cachix.org"
+        "https://cosmic.cachix.org"
       ];
       trusted-public-keys = [
         "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE="
+        "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
       ];
     };
     optimise = {

common/desktop/default.nix

@@ -1,4 +1,10 @@
-{ pkgs, lib, inputs, ... }: {
+{
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+{
   # Bootloader.
   boot = {
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
@@ -14,29 +20,34 @@
     };
   };
 
-  programs.nix-ld.enable = true;
+  # programs.nix-ld.enable = true;
 
   hardware.keyboard.qmk.enable = true;
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
     users.vivian = import ./home.nix;
-    extraSpecialArgs = { inherit inputs; };
+    extraSpecialArgs = {
+      inherit inputs;
+    };
   };
+
+  hardware.pulseaudio.enable = false;
   services = {
 
     # Enable my config for the gnome desktop environment
-    v.gnome.enable = true;
+    v.gnome.enable = lib.mkDefault true;
 
     # Enable CUPS to print documents.
     printing.enable = true;
     pipewire = {
       enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
+      audio.enable = true;
+      # alsa.enable = true;
+      # alsa.support32Bit = true;
       pulse.enable = true;
       # If you want to use JACK applications, uncomment this
-      #jack.enable = true;
+      jack.enable = true;
 
       # use the example session manager (no others are packaged yet so this is enabled by default,
       # no need to redefine it in your config for now)
@@ -62,15 +73,12 @@
   };
 
   # Global Packages
-  environment.systemPackages = with pkgs; [ wireguard-tools sbctl ]; # ++ (if config.virtualisation.podman.enable then [ pkgs.podman-compose ] else []);
+  environment.systemPackages = with pkgs; [
+    wireguard-tools
+    sbctl
+  ]; # ++ (if config.virtualisation.podman.enable then [ pkgs.podman-compose ] else []);
 
-  # programs.virt-manager = {
-  #   enable = true;
-  # };
 
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
 
   virtualisation = {
@@ -88,23 +96,28 @@
     noto-fonts-emoji
     dejavu_fonts
     (nerdfonts.override {
-      fonts =
-        [ "DejaVuSansMono" "Ubuntu" "DroidSansMono" "NerdFontsSymbolsOnly" ];
+      fonts = [
+        "DejaVuSansMono"
+        "Ubuntu"
+        "DroidSansMono"
+        "NerdFontsSymbolsOnly"
+      ];
     })
   ];
   programs = {
     steam = {
-
       enable = true;
       # Open ports in the firewall for Steam Remote Play
       remotePlay.openFirewall = true;
       package = pkgs.steam.override {
-        extraPkgs = pkgs: with pkgs; [ gamescope mangohud ];
+        extraPkgs =
+          pkgs: with pkgs; [
+            gamescope
+            mangohud
+          ];
       };
     };
 
-    gamemode.enable = true;
-
     adb.enable = true;
   };
   networking = {

common/desktop/home.nix

@@ -20,6 +20,8 @@ let
       pyshark
       cryptography
       flask
+      ipwhois
+      pyasn
     ];
 in
 {

common/hm-modules/catppuccin/default.nix

@@ -7,6 +7,12 @@
 with lib;
 let
   cfg = config.themes.v.catppuccin;
+  mako = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "mako";
+    rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df";
+    sha256 = "sha256-nUzWkQVsIH4rrCFSP87mXAka6P+Td2ifNbTuP7NM/SQ=";
+  };
 in
 {
   options.themes.v.catppuccin = {
@@ -24,8 +30,6 @@ in
       font.name = "DejaVuSansMono Nerd Font";
     };
 
-    # home.sessionVariables.GTK_USE_PORTAL = "1";
-
     gtk = {
       enable = true;
       theme = {
@@ -45,24 +49,28 @@ in
       };
     };
 
-    xdg.configFile = {
-      "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
-      "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css";
-      "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
-    };
-
     qt = {
       enable = true;
       platformTheme = "qtct";
-      style = {
-        name = "Catppuccin-Frappe-Pink";
-        package = pkgs.catppuccin-kde.override {
-          flavour = [ "frappe" ];
-          accents = [ "pink" ];
-        };
-      };
+      style.name = "kvantum";
     };
 
+    xdg.configFile = {
+      "Kvantum/kvantum.kvconfig".text = ''
+        [General]
+        theme=Catppuccin-Frappe-Pink
+      '';
+    };
+
+    home.packages = with pkgs; [
+      (catppuccin-kvantum.override {
+        accent = "Pink";
+        variant = "Frappe";
+      })
+    ];
+
+    programs.mako.extraConfig = builtins.readFile "${mako}/src/frappe";
+
     programs.vscode = {
       userSettings."workbench.colorTheme" = "Catppuccin Frappé";
       extensions = [ pkgs.vscode-extensions.catppuccin.catppuccin-vsc ];

common/hm-modules/nvim/default.nix

@@ -40,6 +40,12 @@ with lib;
       clipboard.providers.wl-copy.enable = true;
 
       keymaps = [
+        # General
+        {
+          mode = "n";
+          key = "<leader>";
+          action = ":noh<CR>";
+        }
         # Telescope
         {
           mode = "n";
@@ -185,9 +191,12 @@ with lib;
         FixCursorHold-nvim
         nvim-web-devicons
         nvim-nio
+        nvim-surround
       ];
 
-      extraConfigLua = "";
+      extraConfigLua = "
+        require('nvim-surround').setup()
+      ";
 
       colorschemes.catppuccin = {
         enable = true;
@@ -275,7 +284,7 @@ with lib;
           nixGrammars = true;
           disabledLanguages = [ "latex" ];
         };
-        surround.enable = true;
+        # surround.enable = true;
         fugitive.enable = true;
         gitgutter.enable = true;
 
@@ -326,7 +335,8 @@ with lib;
             };
           };
           servers = {
-            nil_ls.enable = true;
+            cssls.enable = true;
+            nil_ls.enable = true; #NixOS
             dockerls.enable = true;
             rust-analyzer = {
               enable = true;

common/modules/gnome/default.nix

@@ -1,7 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib;
-let cfg = config.services.v.gnome;
-in {
+let
+  cfg = config.services.v.gnome;
+in
+{
   options.services.v.gnome = {
     enable = mkEnableOption "v.gnome";
     hm = mkOption {
@@ -36,7 +43,7 @@ in {
         };
 
         # Enable the GNOME Desktop Environment.
-        displayManager.gdm.enable = true;
+        displayManager.gdm.enable = lib.mkDefault true;
         desktopManager.gnome.enable = true;
       };
       udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
@@ -49,7 +56,11 @@ in {
     # Add Home-manager dconf stuff
     home-manager.sharedModules = mkIf cfg.hm [ ./hm.nix ];
     environment.gnome.excludePackages =
-      (with pkgs; [ gnome-photos gnome-tour gnome-connections ])
+      (with pkgs; [
+        gnome-photos
+        gnome-tour
+        gnome-connections
+      ])
       ++ (with pkgs.gnome; [
         atomix # puzzle game
         epiphany # web browser