add intel drivers, more waybar, niri, other tweaks

frame12/desktop-configuration.nix

@@ -39,6 +39,9 @@ in
       inputs.nur.overlays.default
     ];
 
+    # Intel graphics acceleration
+    hardware.graphics.enable = true;
+    hardware.enableRedistributableFirmware = true;
 
     # Enable flakes feature
     nix.settings.experimental-features = [

frame12/linked-dotfiles/niri/config.kdl

@@ -29,8 +29,9 @@ output "eDP-1"{
     transform "normal"
 }
 
-workspace "net"
 workspace "term"
+workspace "net"
+workspace "chat"
 workspace "scratch"
 
 //
@@ -163,10 +164,19 @@ window-rule {
     open-on-workspace "net"
 }
 
+// Chat windows
+window-rule {
+    match app-id=r#"^com\.discordapp\.Discord$"#
+    match app-id=r#"^org\.signal\.Signal$"#
+
+    default-column-width { proportion 0.8; }
+    block-out-from "screencast"
+    open-on-workspace "chat"
+}
+
 // Scratch windows (exclude unlock dialog so it can open on net)
 window-rule {
     match app-id=r#"^org\.keepassxc\.KeePassXC$"#
-    match app-id=r#"^org\.signal\.Signal$"#
     exclude app-id=r#"^org\.keepassxc\.KeePassXC$"# title="^Unlock Database - KeePassXC$"
 
     block-out-from "screencast"
@@ -187,6 +197,16 @@ window-rule {
     match app-id="org.gnome.Nautilus"
 
     open-floating true
+    open-focused true
+    block-out-from "screencast"
+}
+
+// Steam windowd
+window-rule {
+    match app-id="steam" title="Friends List"
+
+    open-floating true
+    open-focused false
 }
 
 // Bright border on screen-shared windows
@@ -307,7 +327,8 @@ binds {
     Mod+1 { focus-workspace "term"; }
     Mod+2 { focus-workspace "net"; }
     Mod+3 { focus-workspace "chat"; }
-    Mod+4 { focus-workspace 4; }
+    // Mod+3 { focus-workspace 3; }
+    // Mod+4 { focus-workspace 4; }
     Mod+5 { focus-workspace 5; }
     Mod+6 { focus-workspace 6; }
     Mod+7 { focus-workspace 7; }
@@ -317,7 +338,8 @@ binds {
     Mod+Shift+1 { move-column-to-workspace "term"; }
     Mod+Shift+2 { move-column-to-workspace "net"; }
     Mod+Shift+3 { move-column-to-workspace "chat"; }
-    Mod+Shift+4 { move-column-to-workspace 4; }
+    // Mod+Shift+3 { move-column-to-workspace 3; }
+    // Mod+Shift+4 { move-column-to-workspace 4; }
     Mod+Shift+5 { move-column-to-workspace 5; }
     Mod+Shift+6 { move-column-to-workspace 6; }
     Mod+Shift+7 { move-column-to-workspace 7; }

frame12/linked-dotfiles/waybar/config

@@ -23,10 +23,10 @@
         "custom/storage",
         "memory",
         "cpu",
-        "pulseaudio",
+        // "pulseaudio",
-        "custom/keyboard-layout",
+        // "custom/keyboard-layout",
         "battery",
-        "backlight",
+        // "backlight",
         "custom/wlsunset",
         "tray",
         //"custom/weather",
@@ -102,7 +102,7 @@
     "niri/window": {
         "format": "{title}",
         "icon": true,
-        "icon-size": 24,
+        "icon-size": 20,
         "rewrite": {
             // Firefox
             "(.*) — Mozilla Firefox": " $1",
@@ -182,17 +182,20 @@
         "all-outputs": true,
         "format": "  {icon}  ",
         "format-icons": {
-            "1": "",
+            "term": "",
-            "2": "",
+            "net": "",
-            "3": "󰭻",
+            "chat": "󰭻",
-            "4": "",
+            "scratch": "",
+            // Numeric Fallback
+            "1": " 1",
+            "2": " 2",
+            "3": " 3",
+            "4": " 4",
             "5": " 5",
             "6": " 6",
             "7": " 7",
             "8": " 8",
             "9": " 9",
-            "music": "",
-            "scratch": "",
         }
     },
 

frame12/linked-dotfiles/waybar/style.css

@@ -67,7 +67,7 @@
 * {
   border: none;
   border-radius: 0;
-  min-height: 40px;
+  min-height: 30px;
   margin: 0px;
   padding: 0px;
 }
@@ -77,7 +77,7 @@
   background: transparent;
   background-color: transparent;
   font-family: Overpass Nerd Font;
-  font-size: 22px;
+  font-size: 16px;
   color: @text;
 }
 
@@ -99,22 +99,24 @@
 }
 
 .modules-left,
-.modules-right,
+.modules-right {
-.modules-center {
   /* margin: 8px 8px 1px 8px; */
   background: transparent;
   /* color: @; */
   background-color: @base;
-  border-radius: 25px;
+  border-radius: 20px;
-  padding: 0px 10px 0px 10px;
+  padding: 0px 6px 0px 6px;
   border-style: solid;
   border-width: 3px;
   border-color: @surface0;
 }
 
-/* Add gaps for middle module so they space out and dont touch */
+/* Hide empty center module */
 .modules-center {
-  margin: 0px 100px;
+  background: transparent;
+  border: none;
+  padding: 0;
+  min-height: 0;
 }
 
 /* Every modules */
@@ -243,7 +245,7 @@
 }
 
 #workspaces {
-  font-size: 24px;
+  font-size: 16px;
 }
 
 #workspaces button {
@@ -324,17 +326,17 @@
 #custom-power {
   margin-left: 15px;
   margin-right: 15px;
-  font-size: 20px;
+  /* font-size: 16px; */
   color: @flamingo;
 }
 
 #custom-launcher {
-  font-size: 24px;
+  /* font-size: 24px; */
   margin-left: 15px;
   margin-right: 10px;
 }
 
 #backlight.icon {
   padding-right: 1px;
-  font-size: 20px;
+  /* font-size: 16px; */
 }

frame12/modules/home-manager/home.nix

@@ -37,6 +37,7 @@
     unstable.claude-code
     unstable.opencode
     nodejs_24
+    docker-compose
     ### LSP's
     nil
     nodePackages_latest.bash-language-server

frame12/modules/niri/niri_conf.nix

@@ -1,7 +1,17 @@
-{ inputs, lib, config, pkgs, userName, ... }:
+{
-  let
+  inputs,
-    unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
+  lib,
-  in
+  config,
+  pkgs,
+  userName,
+  ...
+}:
+let
+  unstable = import inputs.nixpkgs-unstable {
+    system = "x86_64-linux";
+    config.allowUnfree = true;
+  };
+in
 {
   options.niriwm = {
     enable = lib.mkEnableOption "Enable niri window manager.";
@@ -11,7 +21,7 @@
       description = "Whether to enable non-free software in the niri config";
     };
     systemPackages = lib.mkOption {
-          default = [];
+      default = [ ];
       description = "Add any additional packages desired. Merged with niri defaults.";
     };
     user = lib.mkOption {
@@ -49,7 +59,9 @@
     ###
     ##  System Packages
     ###
-        environment.systemPackages = with pkgs; lib.lists.flatten [
+    environment.systemPackages =
+      with pkgs;
+      lib.lists.flatten [
         [
           bash
           egl-wayland
@@ -90,6 +102,8 @@
       WLR_NO_HARDWARE_CURSORS = "1";
       ELECTRON_OZONE_PLATFORM_HINT = "auto";
       NIXOS_OZONE_WL = "1";
+      # VA-API driver for hardware video acceleration (Intel 13th gen)
+      LIBVA_DRIVER_NAME = "iHD";
     };
 
     # adds additional man pages
@@ -129,7 +143,10 @@
 
     # Set zsh as the default shell system-wide
     users.defaultUserShell = pkgs.zsh;
-        environment.shells = with pkgs; [ zsh bash ];
+    environment.shells = with pkgs; [
+      zsh
+      bash
+    ];
 
     ###
     ##  Services
@@ -174,7 +191,14 @@
             "bluez5.enable-msbc" = true;
             "bluez5.enable-hw-volume" = true;
             # Default roles: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/bluetooth.html#monitor-properties
-                  "bluez5.roles" = [ "a2dp_sink" "a2dp_source" "bap_sink" "bap_source" "hfp_hf" "hfp_ag" ];
+            "bluez5.roles" = [
+              "a2dp_sink"
+              "a2dp_source"
+              "bap_sink"
+              "bap_source"
+              "hfp_hf"
+              "hfp_ag"
+            ];
           };
         };
       };
@@ -200,8 +224,12 @@
           FastConnectable = "true";
           Experimental = "true";
         };
-            Policy = { AutoEnable = "true"; };
+        Policy = {
-            LE = { EnableAdvMonInterleaveScan = 1; };
+          AutoEnable = "true";
+        };
+        LE = {
+          EnableAdvMonInterleaveScan = 1;
+        };
       };
     };
 
@@ -213,6 +241,17 @@
       brscan5.enable = true;
     };
 
+    virtualisation.docker = {
+      enable = true;
+      rootless = {
+        enable = true;
+        setSocketVariable = true;
+      };
+      daemon.settings = {
+        # not needed, intended for windoze
+        userland-proxy = false;
+      };
+    };
     #
     # udev rules
     #

jaci/modules/apps/firefox/firefox.nix

@@ -1,66 +0,0 @@
-{lib, config, pkgs, inputs, ...}:
-let
-  cfg = config.firefoxApp;
-in
-{
-    # imports = [
-    #     inputs.nur.hmModules.nur
-    # ];
-
-    options.firefoxApp = {
-        enable = lib.mkEnableOption "enable firefox browser";
-    };
-    config = lib.mkIf cfg.enable {
-        programs.firefox = {
-            enable = true;
-            profiles = {
-                default = {
-                    id = 0;
-                    name = "default";
-                    isDefault = true;
-                    extensions = with pkgs; [
-                        nur.repos.rycee.firefox-addons.darkreader
-                        nur.repos.rycee.firefox-addons.keepassxc-browser
-                        nur.repos.crazazy.firefox-addons.ublock-origin
-                    ];
-                    search = {
-                        # Replace default firefox search engine config with this one
-                        force = true;
-                        default = "Startpage";
-                        engines = {
-                            "Startpage" = {
-                                urls = [{
-                                    template = "https://www.startpage.com/sp/search?query={searchTerms}";
-                                }];
-                            };
-                        };
-                    };
-                    settings = {
-                       "browser.startup.blankWindow" = true;
-                       "browser.startup.homepage" = "https://www.startpage.com/do/mypage.pl?prfe=11898a1adf7b7dfb587580692f358773a11ca25e993b8e077476641cec033319e15f2449c345f5be919fd0a082015c3e4ed23143bd4337512466c04c2999831a54abca2eaeb42963c63ff064";
-                       "browser.search.region" = "US";
-                       "browser.search.isUS" = true;
-                       "distribution.searchplugins.defaultLocale" = "en-US";
-                       "general.useragent.locale" = "en-US";
-                       "extensions.activeThemeID" = "{831b8843-7251-4306-9521-e688f18b4aeb}";
-                       "privacy.trackingprotection.enable" = true;
-                       "privacy.trackingprotection.emailtracking.enable" = true;
-                       "privacy.trackingprotection.socialtracking.enable" = true;
-                       "privacy.clearOnShutdown.cookies" = true;
-                       "browser.safebrowsing.passwords.enabled" = false;
-                       "browser.migrate.interactions.passwords" = false;
-                       "pref.privacy.disable_button.view_passwords" = false;
-                       "signon.rememberSignon" = false;
-                       "extensions.formautofill.creditCards.enabled" = false;
-                       "extensions.formautofill.addresses.enabled" = false;
-                        # "browser.bookmarks.showMobileBookmarks" = true;
-                       # "browser.newtabpage.pinned" = [{
-                       #   title = "NixOS";
-                       #   url = "https://nixos.org";
-                       # }];
-                   };
-                };
-            };
-        };
-    };
-}

nate-work/modules/apps/firefox/firefox.nix

@@ -1,93 +0,0 @@
-{lib, config, pkgs, inputs, ...}:
-let
-  cfg = config.firefoxApp;
-in
-{
-    # imports = [
-    #     inputs.nur.hmModules.nur
-    # ];
-
-    options.firefoxApp = {
-        enable = lib.mkEnableOption "enable firefox browser";
-    };
-    config = lib.mkIf cfg.enable {
-        programs.firefox = {
-            # Add pipewire support
-            # package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true;}) {});
-            enable = true;
-            profiles = {
-                default = {
-                    id = 0;
-                    name = "default";
-                    isDefault = true;
-                    extensions.packages = with pkgs; [
-                        nur.repos.rycee.firefox-addons.darkreader
-                        nur.repos.rycee.firefox-addons.keepassxc-browser
-                        nur.repos.crazazy.firefox-addons.ublock-origin
-                        nur.repos.bandithedoge.firefoxAddons.stylus
-                    ];
-                    search = {
-                        # Replace default firefox search engine config with this one
-                        force = true;
-                        default = "Startpage";
-                        engines = {
-                            "Startpage" = {
-                                urls = [{
-                                    template = "https://www.startpage.com/sp/search?query={searchTerms}";
-                                }];
-                            };
-                            "Nix Packages" = {
-                                urls = [{
-                                    template = "https://search.nixos.org/packages";
-                                    params = [
-                                        { name = "type"; value = "packages"; }
-                                        { name = "query"; value = "{searchTerms}"; }
-                                    ];
-                                }];
-                                icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                                definedAliases = [ "@np" ];
-                            };
-                            "MySQL Docs" = {
-                                urls = [{
-                                    template = "https://dev.mysql.com/doc/search";
-                                    params = [
-                                        { name = "d"; value = "371"; }
-                                        { name = "p"; value = "1"; }
-                                        { name = "q"; value = "{searchTerms}"; }
-                                    ];
-                                }];
-                                definedAliases = [ "@mysql" ];
-                            };
-                        };
-                    };
-                    settings = {
-                       "browser.startup.blankWindow" = true;
-                       "browser.startup.homepage" = "https://www.startpage.com/do/mypage.pl?prfe=11898a1adf7b7dfb587580692f358773a11ca25e993b8e077476641cec033319e15f2449c345f5be919fd0a082015c3e4ed23143bd4337512466c04c2999831a54abca2eaeb42963c63ff064";
-                       "browser.search.region" = "US";
-                       "browser.search.isUS" = true;
-                       "distribution.searchplugins.defaultLocale" = "en-US";
-                       "general.useragent.locale" = "en-US";
-                       "extensions.activeThemeID" = "{831b8843-7251-4306-9521-e688f18b4aeb}";
-                       "privacy.trackingprotection.enable" = true;
-                       "privacy.trackingprotection.emailtracking.enable" = true;
-                       "privacy.trackingprotection.socialtracking.enable" = true;
-                       "privacy.clearOnShutdown.cookies" = true;
-                       "browser.safebrowsing.passwords.enabled" = false;
-                       "browser.migrate.interactions.passwords" = false;
-                       "pref.privacy.disable_button.view_passwords" = false;
-                       "signon.rememberSignon" = false;
-                       "extensions.formautofill.creditCards.enabled" = false;
-                       "extensions.formautofill.addresses.enabled" = false;
-                       "browser.toolbars.bookmarks.visibility" = "always";
-                       # For applying userContent.css - not being used
-                       # "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-                       # "browser.newtabpage.pinned" = [{
-                       #   title = "NixOS";
-                       #   url = "https://nixos.org";
-                       # }];
-                   };
-                };
-            };
-        };
-    };
-}

nate/modules/apps/firefox/firefox.nix

@@ -1,82 +0,0 @@
-{lib, config, pkgs, inputs, ...}:
-let
-  cfg = config.firefoxApp;
-in
-{
-    # imports = [
-    #     inputs.nur.hmModules.nur
-    # ];
-
-    options.firefoxApp = {
-        enable = lib.mkEnableOption "enable firefox browser";
-    };
-    config = lib.mkIf cfg.enable {
-        programs.firefox = {
-            # Add pipewire support
-            # package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true;}) {});
-            enable = true;
-            profiles = {
-                default = {
-                    id = 0;
-                    name = "default";
-                    isDefault = true;
-                    extensions.packages = with pkgs; [
-                        nur.repos.rycee.firefox-addons.darkreader
-                        nur.repos.rycee.firefox-addons.keepassxc-browser
-                        nur.repos.crazazy.firefox-addons.ublock-origin
-                        nur.repos.bandithedoge.firefoxAddons.stylus
-                    ];
-                    search = {
-                        # Replace default firefox search engine config with this one
-                        force = true;
-                        default = "Startpage";
-                        engines = {
-                            "Startpage" = {
-                                urls = [{
-                                    template = "https://www.startpage.com/sp/search?query={searchTerms}";
-                                }];
-                            };
-                            "Nix Packages" = {
-                                urls = [{
-                                    template = "https://search.nixos.org/packages";
-                                    params = [
-                                        { name = "type"; value = "packages"; }
-                                        { name = "query"; value = "{searchTerms}"; }
-                                    ];
-                                }];
-                                icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                                definedAliases = [ "@np" ];
-                            };
-                        };
-                    };
-                    settings = {
-                       "browser.startup.blankWindow" = true;
-                       "browser.startup.homepage" = "https://www.startpage.com/do/mypage.pl?prfe=11898a1adf7b7dfb587580692f358773a11ca25e993b8e077476641cec033319e15f2449c345f5be919fd0a082015c3e4ed23143bd4337512466c04c2999831a54abca2eaeb42963c63ff064";
-                       "browser.search.region" = "US";
-                       "browser.search.isUS" = true;
-                       "distribution.searchplugins.defaultLocale" = "en-US";
-                       "general.useragent.locale" = "en-US";
-                       "extensions.activeThemeID" = "{831b8843-7251-4306-9521-e688f18b4aeb}";
-                       "privacy.trackingprotection.enable" = true;
-                       "privacy.trackingprotection.emailtracking.enable" = true;
-                       "privacy.trackingprotection.socialtracking.enable" = true;
-                       "privacy.clearOnShutdown.cookies" = true;
-                       "browser.safebrowsing.passwords.enabled" = false;
-                       "browser.migrate.interactions.passwords" = false;
-                       "pref.privacy.disable_button.view_passwords" = false;
-                       "signon.rememberSignon" = false;
-                       "extensions.formautofill.creditCards.enabled" = false;
-                       "extensions.formautofill.addresses.enabled" = false;
-                       "browser.toolbars.bookmarks.visibility" = "always";
-                       # For applying userContent.css - not being used
-                       # "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-                       # "browser.newtabpage.pinned" = [{
-                       #   title = "NixOS";
-                       #   url = "https://nixos.org";
-                       # }];
-                   };
-                };
-            };
-        };
-    };
-}

scrappy/modules/apps/firefox/firefox.nix

@@ -1,82 +0,0 @@
-{lib, config, pkgs, inputs, ...}:
-let
-  cfg = config.firefoxApp;
-in
-{
-    # imports = [
-    #     inputs.nur.hmModules.nur
-    # ];
-
-    options.firefoxApp = {
-        enable = lib.mkEnableOption "enable firefox browser";
-    };
-    config = lib.mkIf cfg.enable {
-        programs.firefox = {
-            # Add pipewire support
-            # package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true;}) {});
-            enable = true;
-            profiles = {
-                default = {
-                    id = 0;
-                    name = "default";
-                    isDefault = true;
-                    extensions.packages = with pkgs; [
-                        nur.repos.rycee.firefox-addons.darkreader
-                        nur.repos.rycee.firefox-addons.keepassxc-browser
-                        nur.repos.crazazy.firefox-addons.ublock-origin
-                        nur.repos.bandithedoge.firefoxAddons.stylus
-                    ];
-                    search = {
-                        # Replace default firefox search engine config with this one
-                        force = true;
-                        default = "Startpage";
-                        engines = {
-                            "Startpage" = {
-                                urls = [{
-                                    template = "https://www.startpage.com/sp/search?query={searchTerms}";
-                                }];
-                            };
-                            "Nix Packages" = {
-                                urls = [{
-                                    template = "https://search.nixos.org/packages";
-                                    params = [
-                                        { name = "type"; value = "packages"; }
-                                        { name = "query"; value = "{searchTerms}"; }
-                                    ];
-                                }];
-                                icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                                definedAliases = [ "@np" ];
-                            };
-                        };
-                    };
-                    settings = {
-                       "browser.startup.blankWindow" = true;
-                       "browser.startup.homepage" = "https://www.startpage.com/do/mypage.pl?prfe=11898a1adf7b7dfb587580692f358773a11ca25e993b8e077476641cec033319e15f2449c345f5be919fd0a082015c3e4ed23143bd4337512466c04c2999831a54abca2eaeb42963c63ff064";
-                       "browser.search.region" = "US";
-                       "browser.search.isUS" = true;
-                       "distribution.searchplugins.defaultLocale" = "en-US";
-                       "general.useragent.locale" = "en-US";
-                       "extensions.activeThemeID" = "{831b8843-7251-4306-9521-e688f18b4aeb}";
-                       "privacy.trackingprotection.enable" = true;
-                       "privacy.trackingprotection.emailtracking.enable" = true;
-                       "privacy.trackingprotection.socialtracking.enable" = true;
-                       "privacy.clearOnShutdown.cookies" = true;
-                       "browser.safebrowsing.passwords.enabled" = false;
-                       "browser.migrate.interactions.passwords" = false;
-                       "pref.privacy.disable_button.view_passwords" = false;
-                       "signon.rememberSignon" = false;
-                       "extensions.formautofill.creditCards.enabled" = false;
-                       "extensions.formautofill.addresses.enabled" = false;
-                       "browser.toolbars.bookmarks.visibility" = "always";
-                       # For applying userContent.css - not being used
-                       # "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-                       # "browser.newtabpage.pinned" = [{
-                       #   title = "NixOS";
-                       #   url = "https://nixos.org";
-                       # }];
-                   };
-                };
-            };
-        };
-    };
-}

shared/modules/apps/firefox/firefox.nix

@@ -29,11 +29,11 @@ in
                     search = {
                         # Replace default firefox search engine config with this one
                         force = true;
-                        default = "Startpage";
+                        default = "Kagi";
                         engines = {
-                            "Startpage" = {
+                            "Kagi" = {
                                 urls = [{
-                                    template = "https://www.startpage.com/sp/search?query={searchTerms}";
+                                    template = "https://kagi.com/search?q={searchTerms}";
                                 }];
                             };
                             "Nix Packages" = {
@@ -47,6 +47,16 @@ in
                                 icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                                 definedAliases = [ "@np" ];
                             };
+                            "NixOS Wiki" = {
+                                urls = [{
+                                    template = "https://wiki.nixos.org/w/index.php";
+                                    params = [
+                                        { name = "search"; value = "{searchTerms}"; }
+                                    ];
+                                }];
+                                icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+                                definedAliases = [ "@nix" ];
+                            };
                             "MySQL Docs" = {
                                 urls = [{
                                     template = "https://dev.mysql.com/doc/search";