diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 2cb9ed9..4aa0575 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -1,5 +1,6 @@ include "dms/binds.kdl" include "dms/outputs.kdl" +include "configs/window-rules.kdl" // https://github.com/YaLTeR/niri/wiki/Configuration:-Input input { @@ -25,15 +26,7 @@ environment { ELECTRON_OZONE_PLATFORM_HINT "auto" } -// ========================= -// Programs to start on startup -// ========================= -window-rule { - match app-id=r#"^Slack$"# - match app-id=r#"^signal$"# - open-focused true -} // ========================= @@ -62,9 +55,9 @@ layout { active-gradient from="#ff06" to="#af0f" angle=45 in="oklch longer hue" inactive-color "#505050" } - border { - off - } + // border { + // off + // } insert-hint { color "#ffc87f80" gradient from="#ffbb6680" to="#ffc88080" angle=45 relative-to="workspace-view" @@ -92,89 +85,6 @@ animations { // ========================= screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" -// ========================= -// Window Rules -// ========================= -// Open the Firefox picture-in-picture player as floating by default. -window-rule { - match app-id="org.pipewire.Helvum" - - open-focused true - open-floating true - default-floating-position x=0 y=25 relative-to="top" - default-window-height { proportion 0.8; } - default-column-width { proportion 0.75; } -} -window-rule { - match app-id=r#"firefox$"# title="^Picture-in-Picture$" - match app-id="org.pulseaudio.pavucontrol" - match app-id="Rofi" - match app-id="nm-connection-editor" - match app-id=".blueman-manager-wrapped" - match app-id=r#"^org.gnome.Calendar$"# - match app-id=r#"^gcr-prompter$"# - match app-id=r#"^xdg-desktop-portal-gnome$"# - match app-id=r#"^nm-applet$"# - match app-id=r#"^chrome-.*"# - match app-id="waypaper" - match title="$Huddle:.*" app-id="Slack" - - open-focused true - open-floating true - default-floating-position x=0 y=25 relative-to="top" - default-window-height { proportion 0.5; } - default-column-width { proportion 0.25; } -} -window-rule { - match app-id="remote-viewer" - open-fullscreen true - open-maximized true - open-focused true -} -window-rule { - match is-active=false - opacity 0.85 -} -window-rule { - match is-urgent=true - open-focused true -} -window-rule { - match app-id="satty" - open-focused true - open-floating true - min-width 800 - min-height 400 - default-floating-position x=-200 y=200 relative-to="top" - - default-window-height { proportion 0.75; } - default-column-width { proportion 0.75; } -} -window-rule { - match app-id="code" - match app-id="org.shotcut.Shotcut" - exclude app-id=r#"^code$"# title=r#"^Visual Studio Code$"# - - open-fullscreen false - open-floating false - open-maximized true - open-focused true - opacity 0.95 -} -window-rule { - match app-id=r"Bitwarden" - match app-id="Sparrow" - match title="Bitwarden" - block-out-from "screen-capture" - shadow { - on - } - focus-ring { - width 4 - active-color "#f00f" - inactive-color "#f00f" - } -} // ========================= // General Stuff // ========================= diff --git a/configs/niri/configs/window-rules.kdl b/configs/niri/configs/window-rules.kdl new file mode 100644 index 0000000..2c39bbc --- /dev/null +++ b/configs/niri/configs/window-rules.kdl @@ -0,0 +1,105 @@ +window-rule { + match app-id=r#"^Slack$"# + match app-id=r#"^signal$"# + open-focused true +} + +// Open the Firefox picture-in-picture player as floating by default. +window-rule { + match app-id="org.pipewire.Helvum" + + open-focused true + open-floating true + default-floating-position x=0 y=25 relative-to="top" + default-window-height { proportion 0.8; } + default-column-width { proportion 0.75; } +} +window-rule { + match app-id=r#"firefox$"# title="^Picture-in-Picture$" + match app-id="org.pulseaudio.pavucontrol" + match app-id="Rofi" + match app-id="nm-connection-editor" + match app-id=".blueman-manager-wrapped" + match app-id=r#"^org.gnome.Calendar$"# + match app-id=r#"^gcr-prompter$"# + match app-id=r#"^xdg-desktop-portal-gnome$"# + match app-id=r#"^nm-applet$"# + match app-id=r#"^chrome-.*"# + match app-id="waypaper" + match title="$Huddle:.*" app-id="Slack" + + open-focused true + open-floating true + default-floating-position x=0 y=25 relative-to="top" + default-window-height { proportion 0.5; } + default-column-width { proportion 0.25; } +} +window-rule { + match app-id="remote-viewer" + open-fullscreen true + open-maximized true + open-focused true +} +window-rule { + match is-active=false + opacity 0.85 +} +window-rule { + match is-urgent=true + open-focused true +} +window-rule { + match app-id="satty" + open-focused true + open-floating true + min-width 800 + min-height 400 + default-floating-position x=-200 y=200 relative-to="top" + + default-window-height { proportion 0.75; } + default-column-width { proportion 0.75; } +} +window-rule { + match app-id="code" + match app-id="org.shotcut.Shotcut" + exclude app-id=r#"^code$"# title=r#"^Visual Studio Code$"# + + open-fullscreen false + open-floating false + open-maximized true + open-focused true + opacity 0.95 +} +window-rule { + match app-id=r"Bitwarden" + match app-id="Sparrow" + match title="Bitwarden" + block-out-from "screen-capture" + // opacity 1 + shadow { + on + } + focus-ring { + width 4 + active-color "#f00f" + inactive-color "#f00f" + } +} +window-rule { + match app-id="Bitwarden" is-focused=false + match app-id="Sparrow" is-focused=false + match title="Bitwarden" is-focused=false + opacity 0.45 +} + + +window-rule { + match app-id=r#"^com.slack.Slack$"# + clip-to-geometry true + border { + on + width 1 + active-color "#0f0f" + inactive-color "#0f0a" + } +} diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 8b71537..8c0ac91 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -288,6 +288,14 @@ in "noauto" ]; }; + fileSystems."/mnt/EightTerra/DownloadedTorrents" = { + device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; + fsType = "nfs"; + options = [ + "x-systemd.automount" + "noauto" + ]; + }; # Remote Builder nix.buildMachines = [ { diff --git a/hosts/hl-bigbox2.hardware-configuration.nix b/hosts/hl-bigbox2.hardware-configuration.nix new file mode 100644 index 0000000..8ad4476 --- /dev/null +++ b/hosts/hl-bigbox2.hardware-configuration.nix @@ -0,0 +1,66 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "xhci_pci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + boot.loader.grub = { + enable = true; + device = "/dev/sdg"; # install GRUB to MBR + efiSupport = false; + }; + boot.loader.efi.canTouchEfiVariables = false; + + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d8cbcc6d-a61c-411e-9d1c-dca986261d86"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/ae5fd844-bee4-4694-90eb-19591589eaad"; + fsType = "ext4"; + }; + + fileSystems."/nix/store" = + { device = "/dev/disk/by-uuid/31eb6380-6c3a-4f79-a13c-8ccc4e775fe7"; + fsType = "btrfs"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/249085eb-f465-4075-8e26-c61a5993d3bf"; + fsType = "btrfs"; + }; + + fileSystems."/data/fourTerra" = + { device = "/dev/sde1"; + fsType = "btrfs"; + }; + + fileSystems."/data/twoHundoGigs" = + { device = "/dev/disk/by-uuid/fb6f1634-c0cc-440f-8fbf-1b655b39245a"; + fsType = "btrfs"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/hl-bigbox2.nix b/hosts/hl-bigbox2.nix new file mode 100644 index 0000000..2cc8655 --- /dev/null +++ b/hosts/hl-bigbox2.nix @@ -0,0 +1,60 @@ +{ config, pkgs, ... }: + +{ + # imports = [ ./hardware-configuration.nix ]; + skyg = { + user.enable = true; + nixos.common = { + ssh-server.enable = true; + containers.openMetricsPort = true; + }; + server.exporters.enable = true; + networkDrives = { + enable = true; + }; + }; + + # firmware updater + services.fwupd.enable = true; + + # # ── Boot ────────────────────────────────────────────────────────────────── + + # # ── Networking ──────────────────────────────────────────────────────────── + # networking.hostName = "bigbox2"; + # networking.networkmanager.enable = true; + + # # ── Locale / Time ───────────────────────────────────────────────────────── + # time.timeZone = "America/Toronto"; + # i18n.defaultLocale = "en_CA.UTF-8"; + + # # ── User ────────────────────────────────────────────────────────────────── + # users.users.ari = { + # isNormalUser = true; + # description = "Ari"; + # extraGroups = [ "wheel" "networkmanager" ]; + # shell = pkgs.bash; + # # Set a password after install with: passwd ari + # }; + + # # Allow sudo for wheel group + # security.sudo.wheelNeedsPassword = true; + + # # ── Base packages ───────────────────────────────────────────────────────── + # environment.systemPackages = with pkgs; [ + # vim + # git + # wget + # curl + # htop + # btrfs-progs + # mdadm + # ]; + + # # ── SSH ─────────────────────────────────────────────────────────────────── + # services.openssh = { + # enable = true; + # settings.PasswordAuthentication = true; # change to false once keys are set up + # }; + + # system.stateVersion = "25.05"; +}