diff --git a/flake.lock b/flake.lock
index 7d49532..72e2204 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,80 +1,5 @@
{
"nodes": {
- "banner": {
- "inputs": {
- "nixpkgs": [
- "gtk-nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1669224926,
- "narHash": "sha256-UK19yx8jNqbPfBZNUeJr2Sms7BhbDAUyJBF5w2CT6Hc=",
- "owner": "the-argus",
- "repo": "banner.nix",
- "rev": "253556f4068f5cb9728e49ac42d630cdc0ccfd58",
- "type": "github"
- },
- "original": {
- "owner": "the-argus",
- "repo": "banner.nix",
- "type": "github"
- }
- },
- "base16-schemes": {
- "flake": false,
- "locked": {
- "lastModified": 1689473676,
- "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=",
- "owner": "tinted-theming",
- "repo": "base16-schemes",
- "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "base16-schemes",
- "type": "github"
- }
- },
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1689068808,
- "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "gtk-nix": {
- "inputs": {
- "banner": "banner",
- "flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs"
- },
- "locked": {
- "lastModified": 1692384535,
- "narHash": "sha256-lFOEsDLV7kuEAcHS7HfyGewTcdSkzTxM+l3XwGhzLgU=",
- "owner": "the-argus",
- "repo": "gtk-nix",
- "rev": "e77b9e68aa818b87389c682b4fd018ad451a85d3",
- "type": "github"
- },
- "original": {
- "owner": "the-argus",
- "repo": "gtk-nix",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -95,56 +20,7 @@
"type": "github"
}
},
- "nix-colors": {
- "inputs": {
- "base16-schemes": "base16-schemes",
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
- "lastModified": 1695388192,
- "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=",
- "owner": "misterio77",
- "repo": "nix-colors",
- "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c",
- "type": "github"
- },
- "original": {
- "owner": "misterio77",
- "repo": "nix-colors",
- "type": "github"
- }
- },
"nixpkgs": {
- "locked": {
- "lastModified": 1692264070,
- "narHash": "sha256-WepAkIL2UcHOj7JJiaFS/vxrA9lklQHv8p+xGL+7oQ0=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "42c25608aa2ad4e5d3716d8d63c606063513ba33",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-unstable",
- "type": "indirect"
- }
- },
- "nixpkgs-lib": {
- "locked": {
- "lastModified": 1694911725,
- "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=",
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "rev": "819180647f428a3826bfc917a54449da1e532ce0",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "type": "github"
- }
- },
- "nixpkgs_2": {
"locked": {
"lastModified": 1703013332,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
@@ -162,25 +38,8 @@
},
"root": {
"inputs": {
- "gtk-nix": "gtk-nix",
"home-manager": "home-manager",
- "nix-colors": "nix-colors",
- "nixpkgs": "nixpkgs_2"
- }
- },
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
+ "nixpkgs": "nixpkgs"
}
}
},
diff --git a/flake.nix b/flake.nix
index 508fd6a..7454576 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,8 +9,6 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
- nix-colors.url = "github:misterio77/nix-colors";
- gtk-nix.url = "github:the-argus/gtk-nix";
};
outputs = { nixpkgs, home-manager, ... }@inputs:
let
diff --git a/home-manager/cli.nix b/home-manager/cli.nix
index a1f1b04..827e443 100644
--- a/home-manager/cli.nix
+++ b/home-manager/cli.nix
@@ -2,7 +2,6 @@
{ config, lib, pkgs, inputs, user, ... }:
{
imports = [
- inputs.nix-colors.homeManagerModules.default
./base.nix
./dots/tmux.nix
./dots/bash.nix
diff --git a/home-manager/dots/bash.nix b/home-manager/dots/bash.nix
index ad3ba28..4df3fab 100644
--- a/home-manager/dots/bash.nix
+++ b/home-manager/dots/bash.nix
@@ -57,24 +57,24 @@
# Uncomment the following line if you don't like systemctl's auto-paging feature:
export SYSTEMD_PAGER=
export PS1='\n\u@\h:\w (\j)\n$? \$ '
- export BEMENU_OPTS="--tb '#03'\
- --tf '#${config.colorScheme.colors.base07}'\
- --fb '#${config.colorScheme.colors.base00}'\
- --ff '#${config.colorScheme.colors.base07}'\
- --nb '#${config.colorScheme.colors.base00}'\
- --nf '#${config.colorScheme.colors.base07}'\
- --hb '#${config.colorScheme.colors.base02}'\
- --hf '#${config.colorScheme.colors.base07}'\
- --sb '#${config.colorScheme.colors.base02}'\
- --sf '#${config.colorScheme.colors.base07}'\
- --scb '#${config.colorScheme.colors.base00}'\
- --scf '#${config.colorScheme.colors.base07}'\
- --fn 'Comic Mono 12'\
- --hp '10'\
- --binding 'vim'\
- --vim-esc-exits\
- --ignorecase\
- --no-overlap"
+ export BEMENU_OPTS="--fn 'Comic Mono 12'\
+ --tb '#6272a4'\
+ --tf '#f8f8f2'\
+ --fb '#282a36'\
+ --ff '#f8f8f2'\
+ --nb '#282a36'\
+ --nf '#6272a4'\
+ --hb '#44475a'\
+ --hf '#50fa7b'\
+ --sb '#44475a'\
+ --sf '#50fa7b'\
+ --scb '#282a36'\
+ --scf '#ff79c6'"
+ --hp '10'\
+ --binding 'vim'\
+ --vim-esc-exits\
+ --ignorecase\
+ --no-overlap"
'';
};
};
diff --git a/home-manager/dots/foot.nix b/home-manager/dots/foot.nix
index 2e327e3..bc5441a 100644
--- a/home-manager/dots/foot.nix
+++ b/home-manager/dots/foot.nix
@@ -4,28 +4,31 @@
enable = true;
settings = {
main = {
- font = "Comic Mono:size=11";
+ font = "Comic Mono:size=12";
};
colors = {
alpha = 1.0;
- foreground = "${config.colorScheme.colors.base07}";
- background = "${config.colorScheme.colors.base00}";
- regular0 = "${config.colorScheme.colors.base00}";
- regular1 = "${config.colorScheme.colors.base01}";
- regular2 = "${config.colorScheme.colors.base02}";
- regular3 = "${config.colorScheme.colors.base03}";
- regular4 = "${config.colorScheme.colors.base04}";
- regular5 = "${config.colorScheme.colors.base05}";
- regular6 = "${config.colorScheme.colors.base06}";
- regular7 = "${config.colorScheme.colors.base07}";
- bright0 = "${config.colorScheme.colors.base08}";
- bright1 = "${config.colorScheme.colors.base09}";
- bright2 = "${config.colorScheme.colors.base0A}";
- bright3 = "${config.colorScheme.colors.base0B}";
- bright4 = "${config.colorScheme.colors.base0C}";
- bright5 = "${config.colorScheme.colors.base0D}";
- bright6 = "${config.colorScheme.colors.base0E}";
- bright7 = "${config.colorScheme.colors.base0F}";
+ background = "282a36";
+ foreground = "f8f8f2";
+ regular0 = "21222c";
+ regular1 = "ff5555";
+ regular2 = "50fa7b";
+ regular3 = "f1fa8c";
+ regular4 = "bd93f9";
+ regular5 = "ff79c6";
+ regular6 = "8be9fd";
+ regular7 = "f8f8f2";
+ bright0 = "6272a4";
+ bright1 = "ff6e6e";
+ bright2 = "69ff94";
+ bright3 = "ffffa5";
+ bright4 = "d6acff";
+ bright5 = "ff92df";
+ bright6 = "a4ffff";
+ bright7 = "ffffff";
+ selection-foreground = "ffffff";
+ selection-background = "44475a";
+ urls = "8be9fd";
};
};
};
diff --git a/home-manager/dots/gtk.nix b/home-manager/dots/gtk.nix
index 86939ad..b99a27b 100644
--- a/home-manager/dots/gtk.nix
+++ b/home-manager/dots/gtk.nix
@@ -5,91 +5,13 @@
font = {
name = "Comic Mono";
};
- };
- gtkNix = {
- enable = true;
- configuration = {
- spacing-small = "0.3em";
- spacing-medium = "0.6em";
- spacing-large = "0.9em";
- tint-weak = 0.3;
- tint-medium = 0.6;
- tint-strong = 0.9;
- border-size = "0.2em";
- radius = "0.5em";
- disabled-opacity = 0.3;
+ iconTheme = {
+ name = "dracula-icon-theme";
+ package = "pkgs.dracula-icon-theme";
};
-
- defaultTransparency = 255;
-
- # neither of these options are very useful. They're just so that if
- # I forgot to make something configurable, you can override previous
- # variable definitions.
- extraConfigSCSS = '''';
- extraColorSCSS = '''';
-
- whites = let
- mkWhite = alpha: "f0f0f3${alpha}";
- in {
- strongest = mkWhite "FF";
- strong = mkWhite "DE";
- moderate = mkWhite "57";
- weak = mkWhite "24";
- weakest = mkWhite "0F";
- };
- blacks = let
- mkBlack = alpha: "191724${alpha}";
- in {
- strongest = mkBlack "FF";
- strong = mkBlack "DE";
- moderate = mkBlack "6B";
- weak = mkBlack "26";
- weakest = mkBlack "0F";
- };
-
- palette = rec {
- # the banner palette format. can also be a path to a yaml file
- # instead of attrs. this example is rose pine.
- base00 = "${config.colorScheme.colors.base00}";
- base01 = "${config.colorScheme.colors.base01}";
- base02 = "${config.colorScheme.colors.base02}";
- base03 = "${config.colorScheme.colors.base03}";
- base04 = "${config.colorScheme.colors.base04}";
- base05 = "${config.colorScheme.colors.base05}";
- base06 = "${config.colorScheme.colors.base06}";
- base07 = "${config.colorScheme.colors.base07}";
- base08 = "${config.colorScheme.colors.base08}";
- base09 = "${config.colorScheme.colors.base09}";
- base10 = "${config.colorScheme.colors.base0A}";
- base11 = "${config.colorScheme.colors.base0B}";
- base12 = "${config.colorScheme.colors.base0C}";
- base13 = "${config.colorScheme.colors.base0D}";
- base14 = "${config.colorScheme.colors.base0E}";
- base15 = "${config.colorScheme.colors.base0F}";
- highlight = "${config.colorScheme.colors.base0E}";
- hialt0 = "${config.colorScheme.colors.base0A}";
- hialt1 = "${config.colorScheme.colors.base0E}";
- hialt2 = "${config.colorScheme.colors.base0B}";
- urgent = "${config.colorScheme.colors.base09}";
- warn = "${config.colorScheme.colors.base0A}";
- confirm = "${config.colorScheme.colors.base0D}";
- link = "${config.colorScheme.colors.base0E}";
- pfg-highlight = "${config.colorScheme.colors.base00}";
- pfg-hialt0 = "${config.colorScheme.colors.base00}";
- pfg-hialt1 = "${config.colorScheme.colors.base00}";
- pfg-hialt2 = "${config.colorScheme.colors.base05}";
- pfg-urgent = "${config.colorScheme.colors.base00}";
- pfg-warn = "${config.colorScheme.colors.base00}";
- pfg-confirm = "${config.colorScheme.colors.base00}";
- pfg-link = "${config.colorScheme.colors.base00}";
- ansi00 = "${config.colorScheme.colors.base03}";
- ansi01 = "${config.colorScheme.colors.base09}";
- ansi02 = "${config.colorScheme.colors.base0D}";
- ansi03 = "${config.colorScheme.colors.base0A}";
- ansi04 = "${config.colorScheme.colors.base0C}";
- ansi05 = "${config.colorScheme.colors.base0E}";
- ansi06 = "${config.colorScheme.colors.base0B}";
- ansi07 = "${config.colorScheme.colors.base05}";
+ theme = {
+ name = "dracula-theme";
+ package = "pkgs.dracula-theme";
};
};
}
diff --git a/home-manager/dots/mako.nix b/home-manager/dots/mako.nix
index 5792d19..a2e405a 100644
--- a/home-manager/dots/mako.nix
+++ b/home-manager/dots/mako.nix
@@ -2,11 +2,11 @@
{
services.mako = {
enable = true;
- backgroundColor = "#${config.colorScheme.colors.base01}";
- borderColor = "#${config.colorScheme.colors.base0D}";
+ backgroundColor = "#282A36";
+ borderColor = "#BD93F9";
borderRadius = 5;
borderSize = 2;
- textColor = "#${config.colorScheme.colors.base07}";
+ textColor = "#F8F8F2";
anchor = "top-right";
layer = "overlay";
maxVisible = 5;
@@ -14,15 +14,15 @@
defaultTimeout = 10000;
extraConfig = ''
[urgency=low]
- border-color=#${config.colorScheme.colors.base00}
- text-color=#${config.colorScheme.colors.base07}
+ border-color=#282A36
+ text-color=#F8F8F2
[urgency=normal]
- border-color=#${config.colorScheme.colors.base0D}
- text-color=#${config.colorScheme.colors.base07}
+ border-color=#BD93F9
+ text-color=#F8F8F2
[urgency=high]
- background-color=#${config.colorScheme.colors.base0D}
- border-color=#${config.colorScheme.colors.base0D}
- text-color=#${config.colorScheme.colors.base07}
+ background-color=#FF5555
+ border-color=#FF5555
+ text-color=#F8F8F2
'';
};
}
diff --git a/home-manager/dots/river.nix b/home-manager/dots/river.nix
index 76859d6..879e790 100644
--- a/home-manager/dots/river.nix
+++ b/home-manager/dots/river.nix
@@ -24,9 +24,9 @@
riverctl spawn "nm-applet"
# Theme
- riverctl background-color 0x${config.colorScheme.colors.base00}
- riverctl border-color-focused 0x${config.colorScheme.colors.base0C}
- riverctl border-color-unfocused 0x${config.colorScheme.colors.base00}
+ riverctl background-color 0x282A36
+ riverctl border-color-focused 0xF8F8F2
+ riverctl border-color-unfocused 0x282A36
# Launch Shortcuts
riverctl map normal Super Return spawn "$TERMINAL tmux.sh"
diff --git a/home-manager/dots/special.nix b/home-manager/dots/special.nix
deleted file mode 100644
index aab0995..0000000
--- a/home-manager/dots/special.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs, config, ... }:
-{
- xdg.configFile = {
- "current_theme.xml" = {
- enable = true;
- text = ''
- ${config.colorScheme.colors.base00}
- ${config.colorScheme.colors.base01}
- ${config.colorScheme.colors.base02}
- ${config.colorScheme.colors.base03}
- ${config.colorScheme.colors.base04}
- ${config.colorScheme.colors.base05}
- ${config.colorScheme.colors.base06}
- ${config.colorScheme.colors.base07}
- ${config.colorScheme.colors.base08}
- ${config.colorScheme.colors.base09}
- ${config.colorScheme.colors.base0A}
- ${config.colorScheme.colors.base0B}
- ${config.colorScheme.colors.base0C}
- ${config.colorScheme.colors.base0D}
- ${config.colorScheme.colors.base0E}
- ${config.colorScheme.colors.base0F}
- '';
- };
- };
-}
diff --git a/home-manager/dots/swaylock.nix b/home-manager/dots/swaylock.nix
index 7b11de6..9ed72e0 100644
--- a/home-manager/dots/swaylock.nix
+++ b/home-manager/dots/swaylock.nix
@@ -3,28 +3,28 @@
programs.swaylock = {
enable = true;
settings = {
- color = "${config.colorScheme.colors.base00}";
- inside-color = "${config.colorScheme.colors.base01}";
- line-color = "${config.colorScheme.colors.base01}";
- ring-color = "${config.colorScheme.colors.base09}";
- text-color = "${config.colorScheme.colors.base07}";
- layout-bg-color = "${config.colorScheme.colors.base01}";
- layout-text-color = "${config.colorScheme.colors.base07}";
- inside-clear-color = "${config.colorScheme.colors.base04}";
- line-clear-color = "${config.colorScheme.colors.base01}";
- ring-clear-color = "${config.colorScheme.colors.base04}";
- text-clear-color = "${config.colorScheme.colors.base01}";
- inside-ver-color = "${config.colorScheme.colors.base09}";
- line-ver-color = "${config.colorScheme.colors.base01}";
- ring-ver-color = "${config.colorScheme.colors.base09}";
- text-ver-color = "${config.colorScheme.colors.base01}";
- inside-wrong-color = "${config.colorScheme.colors.base0B}";
- line-wrong-color = "${config.colorScheme.colors.base01}";
- ring-wrong-color = "${config.colorScheme.colors.base0B}";
- text-wrong-color = "${config.colorScheme.colors.base01}";
- bs-hl-color = "${config.colorScheme.colors.base0B}";
- key-hl-color = "${config.colorScheme.colors.base02}";
- text-caps-lock-color = "${config.colorScheme.colors.base07}";
+ color = "282a36";
+ inside-color = "1F202A";
+ line-color = "1F202A";
+ ring-color = "bd93f9";
+ text-color = "f8f8f2";
+ layout-bg-color = "1F202A";
+ layout-text-color = "f8f8f2";
+ inside-clear-color = "6272a4";
+ line-clear-color = "1F202A";
+ ring-clear-color = "6272a4";
+ text-clear-color = "1F202A";
+ inside-ver-color = "bd93f9";
+ line-ver-color = "1F202A";
+ ring-ver-color = "bd93f9";
+ text-ver-color = "1F202A";
+ inside-wrong-color = "ff5555";
+ line-wrong-color = "1F202A";
+ ring-wrong-color = "ff5555";
+ text-wrong-color = "1F202A";
+ bs-hl-color = "ff5555";
+ key-hl-color = "50fa7b";
+ text-caps-lock-color = "f8f8f2";
};
};
}
diff --git a/home-manager/dots/tmux.nix b/home-manager/dots/tmux.nix
index 691edda..776913b 100644
--- a/home-manager/dots/tmux.nix
+++ b/home-manager/dots/tmux.nix
@@ -43,16 +43,12 @@
# Set status bar postition
set -g status-position top
- # Status bar theme
- set -g status-style "fg=#${config.colorScheme.colors.base0D}"
-
- # Window theme
- setw -g window-status-current-style "bg=#${config.colorScheme.colors.base0D} fg=#${config.colorScheme.colors.base00}
- setw -g window-status-current-format " #I:#W#F "
- setw -g window-status-format "[#I:#W#F]"
+ setw -g window-status-current-format "[#I:#W#F]"
+ setw -g window-status-format "#I:#W#F"
'';
- plugins = with pkgs; [
- tmuxPlugins.urlview
+ plugins = with pkgs.tmuxPlugins; [
+ dracula
+ urlview
];
};
}
diff --git a/home-manager/gui.nix b/home-manager/gui.nix
index 28797f5..83522b2 100644
--- a/home-manager/gui.nix
+++ b/home-manager/gui.nix
@@ -4,6 +4,20 @@
imports = [
./cli.nix
];
+ gtk = {
+ enable = true;
+ font = {
+ name = "Comic Mono";
+ };
+ iconTheme = {
+ name = "dracula-icon-theme";
+ package = "pkgs.dracula-icon-theme";
+ };
+ theme = {
+ name = "dracula-theme";
+ package = "pkgs.dracula-theme";
+ };
+ };
xdg = {
systemDirs.data = [
"/var/lib/flatpak/exports/share"
diff --git a/home-manager/wayland.nix b/home-manager/wayland.nix
index 54667ac..406bae3 100644
--- a/home-manager/wayland.nix
+++ b/home-manager/wayland.nix
@@ -2,19 +2,14 @@
{ config, lib, pkgs, inputs, user, ... }:
{
imports = [
- inputs.gtk-nix.homeManagerModule
./gui.nix
./dots/foot.nix
./dots/mako.nix
./dots/river.nix
- ./dots/special.nix
./dots/swappy.nix
./dots/swaylock.nix
./dots/waybar.nix
];
- # themes can be found here: https://github.com/tinted-theming/base16-schemes
- colorScheme = inputs.nix-colors.colorSchemes.dracula;
- gtkNix.enable = true;
services.kanshi = {
enable = true;
profiles = {
diff --git a/todos/20240116194420.todo.md b/todos/20240116194420.todo.md
index ed04abf..be8e9c6 100644
--- a/todos/20240116194420.todo.md
+++ b/todos/20240116194420.todo.md
@@ -1 +1,12 @@
# [ ] Web Services
+
+soju/senpai
+soundcloud
+bitwarden
+searx
+miniflux
+ssh
+http
+gemini
+gopher
+