Mercurial > nixos

changeset 1:f78c8a98f113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new stuff and remove useless overlay in home.nix
author Yasuri <yasuri@charliesmp.net>
date Fri, 02 Oct 2026 18:58:29 -0500
parents face7f4d84f7
children a2c891f7b914
files config/dwm/config.def.h config/st/config.def.h configuration.nix flake.lock home.nix
diffstat 5 files changed, 91 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/config/dwm/config.def.h	Mon Sep 28 13:10:19 2026 -0500
+++ b/config/dwm/config.def.h	Fri Oct 02 18:58:29 2026 -0500
@@ -12,17 +12,15 @@
 static const int topbar             = 1;        /* 0 means bottom bar */
 static const char *fonts[]          = { "JetBrainsMono Nerd Font Propo:size=10" };
 static const char dmenufont[]       = "JetBrainsMono Nerd Font Propo:size=10";
-static const char col_bg[]     = "#1c1a2b";
-static const char col_border[] = "#4a4668";
-static const char col_fg[]     = "#e8e0f0";
-static const char col_selfg[]  = "#1c1a2b";
-static const char col_selbg[]  = "#f5b0d8";
-static const char col_selbrd[] = "#6ecbff";
-
+static const char col_gray1[] = "#0f1a12"; /* bar bg */
+static const char col_gray2[] = "#2e4234"; /* inactive border */
+static const char col_gray3[] = "#b9c7bd"; /* bar fg */
+static const char col_gray4[] = "#0f1a12"; /* selected fg */
+static const char col_cyan[]  = "#5fae2e"; /* selected bg and border */
 static const char *colors[][3] = {
-	/*               fg         bg         border     */
-	[SchemeNorm] = { col_fg,    col_bg,    col_border },
-	[SchemeSel]  = { col_selfg, col_selbg, col_selbrd },
+	/*               fg         bg         border   */
+	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
 };
 
 /* tagging */
@@ -80,8 +78,8 @@
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_bg, "-nf", col_fg, "-sb", col_selbg, "-sf", col_selfg, NULL };
-static const char *termcmd[]  = { "st", NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *termcmd[]  = { "st", "-e", "tmux", NULL };
 
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
--- a/config/st/config.def.h	Mon Sep 28 13:10:19 2026 -0500
+++ b/config/st/config.def.h	Fri Oct 02 18:58:29 2026 -0500
@@ -96,44 +96,40 @@
 /* bg opacity */
 float alpha = 0.8;
 
-/* st colorscheme based on the pastel pink/blue mountain wallpaper.
- * Replace the colorname array and the default* indexes in config.h. */
- 
 static const char *colorname[] = {
 	/* 8 normal colors */
-	"#1c1a2b", /* 0  black   deep dusk purple */
-	"#f28fad", /* 1  red     rose pink */
-	"#8fe3c8", /* 2  green   sea mint */
-	"#f5d5b8", /* 3  yellow  sun peach */
-	"#79a6f5", /* 4  blue    wave blue */
-	"#e9a0e6", /* 5  magenta mountain pink */
-	"#7fd6f5", /* 6  cyan    sky blue */
-	"#e8e0f0", /* 7  white   haze */
- 
+	"#0f1a12", /* black */
+	"#b5533c", /* red, bark rust */
+	"#4f9a2f", /* green, moss */
+	"#c2b84a", /* yellow */
+	"#4a7f8f", /* blue, water shadow */
+	"#8a6f8f", /* magenta */
+	"#5fb09a", /* cyan */
+	"#c9d6cc", /* white, mist */
+
 	/* 8 bright colors */
-	"#4a4668", /* 8  bright black */
-	"#ff9fbd", /* 9  bright red */
-	"#a6f0d8", /* 10 bright green */
-	"#ffe6cc", /* 11 bright yellow */
-	"#9dbcff", /* 12 bright blue */
-	"#f5b8f2", /* 13 bright magenta */
-	"#a8e8fb", /* 14 bright cyan */
-	"#ffffff", /* 15 bright white */
- 
+	"#2e4234", /* bright black */
+	"#d9775c", /* bright red */
+	"#8fd14f", /* bright green, new leaves */
+	"#e0d878", /* bright yellow */
+	"#7fb3c4", /* bright blue */
+	"#b595b8", /* bright magenta */
+	"#8fdcc3", /* bright cyan */
+	"#eef4f0", /* bright white, rapids */
+
 	[255] = 0,
- 
+
 	/* extra colors */
-	"#f5b0d8", /* 256 cursor */
-	"#6ecbff", /* 257 reverse cursor */
-	"#e8e0f0", /* 258 foreground */
-	"#1c1a2b", /* 259 background */
+	"#8fd14f", /* 256 cursor */
+	"#5fae2e", /* 257 reverse cursor */
+	"#c9d6cc", /* 258 default fg */
+	"#0f1a12", /* 259 default bg */
 };
- 
+
 unsigned int defaultfg = 258;
 unsigned int defaultbg = 259;
 unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
-
+unsigned int defaultrcs = 257;
 
 /*
  * Default shape of cursor
@@ -142,7 +138,7 @@
  * 6: Bar ("|")
  * 7: Snowman ("☃")
  */
-static unsigned int cursorshape = 2;
+static unsigned int cursorshape = 6;
 
 /*
  * Default columns and rows numbers
--- a/configuration.nix	Mon Sep 28 13:10:19 2026 -0500
+++ b/configuration.nix	Fri Oct 02 18:58:29 2026 -0500
@@ -59,7 +59,6 @@
     ];
  };
 
-  programs.firefox.enable = true;
 
   environment.systemPackages = with pkgs; [
     vim 
--- a/flake.lock	Mon Sep 28 13:10:19 2026 -0500
+++ b/flake.lock	Fri Oct 02 18:58:29 2026 -0500
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790365885,
-        "narHash": "sha256-iQ0ebhiVo64NktTnwft9hNxlFu4j5cvljVxyJaEVIP4=",
+        "lastModified": 1790972726,
+        "narHash": "sha256-TVgDIhNGx2bLl1fBOr13YOMJTiMKEoxpxT8leF7hh/8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7b4c5ec4bedaf1e062bbc1bcaeddbc6bd242aa1b",
+        "rev": "47c54aec43c13a728094881551db60b5cc4cc16e",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1790578696,
-        "narHash": "sha256-EvoKOTtoIJ7Xflls2Nfo5WDcqjFJB0kuzwOz0nLWs0w=",
-        "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f",
+        "lastModified": 1790822859,
+        "narHash": "sha256-VBA0QerzzmL+4wxgtwiCdiLwLpJg2/9xOxhgO3BRJQA=",
+        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1080855.7a0f122f5090/nixexprs.tar.zst"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1083223.c59305bab206/nixexprs.tar.zst"
       },
       "original": {
         "id": "nixpkgs",
--- a/home.nix	Mon Sep 28 13:10:19 2026 -0500
+++ b/home.nix	Fri Oct 02 18:58:29 2026 -0500
@@ -12,25 +12,56 @@
     home.packages = with pkgs; [
      pkgs.audacious
      pkgs.vesktop
+     pkgs.macchina
+     pkgs.xclip
     ];
-      nixpkgs.overlays = [
-    (final: prev: {
-      audacious-bare = prev.audacious-bare.overrideAttrs (old: {
-        nativeBuildInputs = old.nativeBuildInputs ++ [ final.wrapGAppsHook3 ];
-        buildInputs = old.buildInputs ++ [ final.gtk3 ];
-        mesonFlags = old.mesonFlags ++ [ "-Dgtk=true" ];
-        dontWrapGApps = true;
-        preFixup = (old.preFixup or "") + ''
-          qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-        '';
-      });
-      audacious-plugins = prev.audacious-plugins.overrideAttrs (old: {
-        buildInputs = old.buildInputs ++ [ final.gtk3 ];
-        mesonFlags = old.mesonFlags ++ [ "-Dgtk=true" ];
-      });
-    })
-  ];
+    programs.librewolf.enable = true;
     home.stateVersion = "26.05";
     home.file.".config/alacritty".source = ./config/alacritty;
     home.file.".config/picom".source = ./config/picom;
+    programs.tmux = {
+  enable = true;
+  prefix = "C-Space";
+  mouse = true;
+  baseIndex = 1;
+  keyMode = "vi";
+  escapeTime = 0;
+  historyLimit = 50000;
+  terminal = "tmux-256color";
+  clock24 = true;
+
+  extraConfig = ''
+    # truecolor for st
+    set -ga terminal-overrides ",st-256color:RGB"
+    set -g renumber-windows on
+
+    # splits keep the current directory
+    bind | split-window -h -c "#{pane_current_path}"
+    bind - split-window -v -c "#{pane_current_path}"
+    bind c new-window -c "#{pane_current_path}"
+
+    # vim style pane movement
+    bind h select-pane -L
+    bind j select-pane -D
+    bind k select-pane -U
+    bind l select-pane -R
+
+    bind r source-file ~/.config/tmux/tmux.conf \; display "reloaded"
+
+    # palette: forest floor, moss, fern, mist
+    set -g status-style "bg=#0f1a10,fg=#cfe3cf"
+    set -g status-left-length 30
+    set -g status-left "#[bg=#7bc043,fg=#0f1a10,bold] #S #[default] "
+    set -g status-right "#[fg=#6b7a70]%a %b %d #[bg=#4f9d2d,fg=#0f1a10,bold] %H:%M "
+    set -g window-status-format "#[fg=#6b7a70] #I #W "
+    set -g window-status-current-format "#[bg=#2a3f2a,fg=#a5d63f,bold] #I #W "
+    set -g pane-border-style "fg=#2a3f2a"
+    set -g pane-active-border-style "fg=#7bc043"
+    set -g message-style "bg=#7bc043,fg=#0f1a10"
+    set -g mode-style "bg=#4f9d2d,fg=#0f1a10"
+    bind -T copy-mode-vi v send -X begin-selection
+bind -T copy-mode-vi y send -X copy-pipe-and-cancel "xclip -selection clipboard -i"
+bind -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe-and-cancel "xclip -selection clipboard -i"
+  '';
+};
 }