aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hosts/lust/default.nix7
-rw-r--r--hosts/lust/hardware-configuration.nix65
-rw-r--r--modules/user/desktop/default.nix9
-rw-r--r--modules/user/desktop/swayfx.nix55
-rw-r--r--user/home/kakoune/colors/nord.kak112
-rw-r--r--user/home/kakoune/colors/rose-pine.kak (renamed from user/home/kakoune/rose-pine.kak)0
-rw-r--r--user/home/kakoune/default.nix5
-rw-r--r--user/home/vencord/default.nix2
8 files changed, 209 insertions, 46 deletions
diff --git a/hosts/lust/default.nix b/hosts/lust/default.nix
index ac86b7b..9d0bfaf 100644
--- a/hosts/lust/default.nix
+++ b/hosts/lust/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
{
imports = [
../../common/pipewire.nix
diff --git a/hosts/lust/hardware-configuration.nix b/hosts/lust/hardware-configuration.nix
index 2614284..b7830ed 100644
--- a/hosts/lust/hardware-configuration.nix
+++ b/hosts/lust/hardware-configuration.nix
@@ -1,41 +1,56 @@
# 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, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ modulesPath,
+ ...
+}:
{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
- boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+ boot.initrd.availableKernelModules = [
+ "nvme"
+ "xhci_pci"
+ "ahci"
+ "usbhid"
+ "sd_mod"
+ ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb";
- fsType = "btrfs";
- options = [ "subvol=@rootfs" ];
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb";
+ fsType = "btrfs";
+ options = [ "subvol=@rootfs" ];
+ };
- fileSystems."/etc" =
- { device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb";
- fsType = "btrfs";
- options = [ "subvol=@etc" ];
- };
+ fileSystems."/etc" = {
+ device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb";
+ fsType = "btrfs";
+ options = [ "subvol=@etc" ];
+ };
- fileSystems."/home" =
- { device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb";
- fsType = "btrfs";
- options = [ "subvol=@homes" ];
- };
+ fileSystems."/home" = {
+ device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb";
+ fsType = "btrfs";
+ options = [ "subvol=@homes" ];
+ };
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/A8C6-E3EB";
- fsType = "vfat";
- options = [ "fmask=0022" "dmask=0022" ];
- };
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/A8C6-E3EB";
+ fsType = "vfat";
+ options = [
+ "fmask=0022"
+ "dmask=0022"
+ ];
+ };
swapDevices = [ ];
diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index e929af8..53911ec 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -69,8 +69,8 @@
cursor.blink = true;
main = {
- dpi-aware = true;
- font = "FiraCode Nerd Font Mono:size=8";
+ dpi-aware = lib.mkDefault true;
+ font = lib.mkDefault "FiraCode Nerd Font Mono:size=8";
};
mouse.hide-when-typing = true;
@@ -94,8 +94,8 @@
};
main = {
- dpi-aware = true;
- font = "Fira Code:size=6";
+ dpi-aware = lib.mkDefault true;
+ font = lib.mkDefault "Fira Code:size=6";
show-actions = true;
sort-result = false;
terminal = "foot -a '{cmd}' -T '{cmd}' {cmd}";
@@ -122,6 +122,7 @@
"sidebar.animation.enabled" = false;
"sidebar.new-sidebar.has-used" = true;
"sidebar.verticalTabs" = true;
+ # this keeps getting randomly reset at runtime. why? idfk.
"sidebar.visibility" = "hide-sidebar";
};
};
diff --git a/modules/user/desktop/swayfx.nix b/modules/user/desktop/swayfx.nix
index d9e3db6..2454f23 100644
--- a/modules/user/desktop/swayfx.nix
+++ b/modules/user/desktop/swayfx.nix
@@ -11,6 +11,7 @@
config = {
home.packages = with pkgs; [
grim
+ rose-pine-cursor
slurp
];
@@ -44,14 +45,22 @@
backlight = {
format = "{icon}";
- format-icons = [ "" "󰖨" ];
+ format-icons = [
+ ""
+ "󰖨"
+ ];
tooltip-format = "{percent}%";
};
battery = {
format = "{icon}";
format-critical = "{icon} ({capacity}%)";
- format-icons = [ "" "" "" "" ];
+ format-icons = [
+ ""
+ ""
+ ""
+ ""
+ ];
format-time = "{H}h{m}m";
format-warning = "{icon} ({capacity}%)";
states = {
@@ -97,7 +106,12 @@
format-disabled = "󰀝";
format-disconnected = "󰌙";
format-ethernet = "󰌗 {ipaddr}/{cidr}";
- format-icons = [ "󰤟" "󰤢" "󰤥" "󰤨" ];
+ format-icons = [
+ "󰤟"
+ "󰤢"
+ "󰤥"
+ "󰤨"
+ ];
format-wifi = "{icon}";
interval = 1;
tooltip-format = "{ifname} tx: {bandwidthUpBytes} rx: {bandwidthDownBytes}";
@@ -115,21 +129,31 @@
disable-scroll = true;
format = "";
persistent-workspaces = {
- "1" = [ "DP-1" "eDP-1" ];
- "2" = [ "DP-2" "eDP-1" ];
- "3" = [];
- "4" = [];
- "5" = [];
- "6" = [];
- "7" = [];
- "8" = [];
- "9" = [];
+ "1" = [
+ "DP-1"
+ "eDP-1"
+ ];
+ "2" = [
+ "DP-2"
+ "eDP-1"
+ ];
+ "3" = [ ];
+ "4" = [ ];
+ "5" = [ ];
+ "6" = [ ];
+ "7" = [ ];
+ "8" = [ ];
+ "9" = [ ];
};
};
wireplumber = {
format = "{icon}";
- format-icons = [ "󰕿" "󰖀" "󰕾" ];
+ format-icons = [
+ "󰕿"
+ "󰖀"
+ "󰕾"
+ ];
format-muted = "󰸈";
on-click = "wpctl set-mute @DEFAULT_SINK@ toggle";
tooltip-format = "{node_name} - {volume}%";
@@ -311,7 +335,10 @@
window.titlebar = false;
workspaceOutputAssign = [
{
- output = [ "DP-1" "eDP-1" ];
+ output = [
+ "DP-1"
+ "eDP-1"
+ ];
workspace = "1";
}
{
diff --git a/user/home/kakoune/colors/nord.kak b/user/home/kakoune/colors/nord.kak
new file mode 100644
index 0000000..55bcf52
--- /dev/null
+++ b/user/home/kakoune/colors/nord.kak
@@ -0,0 +1,112 @@
+# Nord Theme
+# https://www.nordtheme.com/docs/colors-and-palettes
+
+evaluate-commands %sh{
+ # Polar Night (black)
+ nord0="rgb:2e3440"
+ nord1="rgb:3b4252"
+ nord2="rgb:434c5e"
+ nord3="rgb:4c566a"
+ nord3_bright="rgb:616e88"
+ # Snow Storm (white)
+ nord4="rgb:d8dee9"
+ nord5="rgb:e5e9f0"
+ nord6="rgb:eceff4"
+ # Frost (blue/green)
+ nord7="rgb:8fbcbb"
+ nord8="rgb:88c0d0"
+ nord9="rgb:81a1c1"
+ nord10="rgb:5e81ac"
+ # Aurora
+ nord11="rgb:bf616a" # red
+ nord12="rgb:d08770" # orange
+ nord13="rgb:ebcb8b" # yellow
+ nord14="rgb:a3be8c" # green
+ nord15="rgb:b48ead" # purple
+
+ # Code highlighting
+ echo "
+ face global variable ${nord4}
+ face global Default ${nord5},${nord0}
+ face global builtin ${nord6}+b
+ face global type ${nord7}
+ face global function ${nord8}
+ face global keyword ${nord9}
+ face global meta ${nord9}
+ face global attribute ${nord12}
+ face global module ${nord13}
+ face global string ${nord14}
+ face global value ${nord15}
+ "
+
+ # comments are brighter since they're hard to see against the cursorline
+ echo "face global comment ${nord3_bright}+i"
+
+ # cursor/selection text is always black
+ # backgrounds use Snow Storm for the primary cursor
+ # and Frost for secondary elements
+ echo "
+ face global PrimaryCursor ${nord0},${nord4}+Bfg
+ face global PrimarySelection ${nord0},${nord8}+g
+ face global SecondaryCursor ${nord0},${nord9}+fg
+ face global SecondarySelection ${nord0},${nord10}+g
+ "
+
+ # current line's number is white and matches the cursorline
+ # other line's numbers are grey like comments
+ echo "
+ face global LineNumbers ${nord3_bright}+b
+ face global LineNumberCursor ${nord4},${nord2}+b
+ "
+
+ # marks a soft-wrap in yellow
+ echo "face global LineNumbersWrapped ${nord13},${nord1}"
+ echo "face global WrapMarker ${nord13}+f"
+
+
+ # selected element in menus
+ echo "face global MenuForeground ${nord0},${nord8}+b"
+
+ # non-selected element(s) in menus
+ echo "face global MenuBackground default,${nord1}"
+
+ # additional info in menus, like autocompletion source
+ echo "face global MenuInfo default+iu"
+
+
+ # bottom status line / prompt
+ # not used much since we have powerline
+ echo "face global StatusLine ${nord4},${nord1}"
+ # tells you what mode you're using (besides normal)
+ echo "face global StatusLineMode ${nord0},${nord7}+b"
+ # special info
+ echo "face global StatusLineInfo ${nord4}+b"
+ # special values
+ echo "face global StatusLineValue ${nord8}+i"
+
+ echo "face global StatusCursor ${nord0},${nord4}"
+ echo "face global Prompt default"
+ echo "face global Whitespace ${nord10},${nord1}+f"
+
+ # not really sure what this line does...
+ echo "face global MatchingChar blue,red+F"
+
+ # extra padding at the end of a buffer (file)
+ echo "face global BufferPadding default,${nord3}"
+
+ # general information, like Clippy
+ echo "face global Information default,${nord1}"
+ echo "face global Error ${nord4},${nord11}"
+
+ # Markup
+ echo "face global title ${nord8},${nord1}+b"
+ echo "face global header ${nord7},${nord1}+b"
+ echo "face global bold default,default+ba"
+ echo "face global mono ${nord10}"
+ echo "face global block ${nord13}"
+ echo "face global Italic default,default+ia"
+ echo "face global Underline default,default+ufa"
+ echo "face global link ${nord8}+u"
+ echo "face global bullet ${nord12}"
+ echo "face global list ${nord14}"
+}
diff --git a/user/home/kakoune/rose-pine.kak b/user/home/kakoune/colors/rose-pine.kak
index 0c96095..0c96095 100644
--- a/user/home/kakoune/rose-pine.kak
+++ b/user/home/kakoune/colors/rose-pine.kak
diff --git a/user/home/kakoune/default.nix b/user/home/kakoune/default.nix
index f5dea88..54c3f0f 100644
--- a/user/home/kakoune/default.nix
+++ b/user/home/kakoune/default.nix
@@ -67,5 +67,8 @@
];
};
- xdg.configFile."kak/colors/rose-pine.kak".source = ./rose-pine.kak;
+ xdg.configFile."kak/colors" = {
+ recursive = true;
+ source = ./colors;
+ };
}
diff --git a/user/home/vencord/default.nix b/user/home/vencord/default.nix
index d6e98a5..b96d4b1 100644
--- a/user/home/vencord/default.nix
+++ b/user/home/vencord/default.nix
@@ -8,7 +8,7 @@
};
settings = {
- enabledThemes = [];
+ enabledThemes = [ ];
plugins = {
AlwaysExpandRoles.enabled = true;
MessageLogger.enabled = true;
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-09 12:10:00 +0000