aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nixpkgs/.config/nixpkgs/common/dwl_4/config.h2
-rwxr-xr-xnixpkgs/.config/nixpkgs/common/scripts/start (renamed from nixpkgs/.config/nixpkgs/common/start.sh)4
-rwxr-xr-xnixpkgs/.config/nixpkgs/common/scripts/walp (renamed from nixpkgs/.config/nixpkgs/common/bg.sh)0
-rw-r--r--nixpkgs/.config/nixpkgs/flake.lock18
-rw-r--r--nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix41
5 files changed, 37 insertions, 28 deletions
diff --git a/nixpkgs/.config/nixpkgs/common/dwl_4/config.h b/nixpkgs/.config/nixpkgs/common/dwl_4/config.h
index b0ef901..84ab1bb 100644
--- a/nixpkgs/.config/nixpkgs/common/dwl_4/config.h
+++ b/nixpkgs/.config/nixpkgs/common/dwl_4/config.h
@@ -109,6 +109,7 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
/* commands */
static const char *termcmd[] = { "foot", NULL };
static const char *menucmd[] = { "wofi", "--show", "run", NULL };
+static const char *rangercmd[] = { "foot", "-e", "ranger", NULL };
static const char *volmute[] = { "amixer", "set", "Master", "toggle", NULL };
static const char *voldown[] = { "amixer", "set", "Master", "10%-", NULL };
static const char *volup[] = { "amixer", "set", "Master", "10%+", NULL };
@@ -142,6 +143,7 @@ static const Key keys[] = {
{ MODKEY, XKB_KEY_space, setlayout, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
+ { MODKEY, XKB_KEY_r, spawn, {.v = rangercmd} },
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
diff --git a/nixpkgs/.config/nixpkgs/common/start.sh b/nixpkgs/.config/nixpkgs/common/scripts/start
index 9bf656e..9af56aa 100755
--- a/nixpkgs/.config/nixpkgs/common/start.sh
+++ b/nixpkgs/.config/nixpkgs/common/scripts/start
@@ -2,8 +2,6 @@
# This a sort-of auto-start script.
# Run this from a tty to start my graphical env.
-export EDITOR=nvim
-
exec dwl -s 'somebar' &
# set blocks on bar
@@ -17,4 +15,4 @@ exec mako &
sleep 1
# set bg
-exec ./bg.sh &
+exec walp &
diff --git a/nixpkgs/.config/nixpkgs/common/bg.sh b/nixpkgs/.config/nixpkgs/common/scripts/walp
index 9bac47e..9bac47e 100755
--- a/nixpkgs/.config/nixpkgs/common/bg.sh
+++ b/nixpkgs/.config/nixpkgs/common/scripts/walp
diff --git a/nixpkgs/.config/nixpkgs/flake.lock b/nixpkgs/.config/nixpkgs/flake.lock
index e1301b2..8d6ad20 100644
--- a/nixpkgs/.config/nixpkgs/flake.lock
+++ b/nixpkgs/.config/nixpkgs/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1682072616,
- "narHash": "sha256-sR5RL3LACGuq5oePcAoJ/e1S3vitKQQSNACMYmqIE1E=",
+ "lastModified": 1683651229,
+ "narHash": "sha256-HN0Mw8g1XQIrcdyzqT00YW0Uqi/V/BUUUAgvcK1pcSM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "47d6c3f65234230d37f1cf7d3d6b5575ec80fe0c",
+ "rev": "983f8a1bb965b261492123cd8e2d07da46d4d50a",
"type": "github"
},
"original": {
@@ -22,11 +22,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1680876084,
- "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=",
+ "lastModified": 1683269598,
+ "narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2",
+ "rev": "51559e691f1493a26f94f1df1aaf516bb507e78b",
"type": "github"
},
"original": {
@@ -38,11 +38,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1681920287,
- "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=",
+ "lastModified": 1683408522,
+ "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
+ "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github"
},
"original": {
diff --git a/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix b/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix
index b8659e3..5621ea5 100644
--- a/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix
+++ b/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix
@@ -2,16 +2,14 @@
{
home.username = "kdam0";
home.homeDirectory = "/home/kdam0";
-
- programs.home-manager.enable = true;
- programs.zsh = {
- enable = true;
- defaultKeymap = "viins";
- initExtra = ''
- source ${config.home.homeDirectory}/.p10k.zsh
- bindkey '^ ' autosuggest-accept
- '';
- shellAliases = {
+ home.sessionPath = [
+ "$HOME/.config/nixpkgs/common/scripts"
+ ];
+ home.sessionVariables = {
+ EDITOR = "nvim";
+ TERM = "xterm-256color";
+ };
+ home.shellAliases = {
l = "ls -l";
ll = "ls -al";
".." = "cd ..";
@@ -20,6 +18,7 @@
gst = "git status";
cdwl = "nvim ~/.config/nixpkgs/common/dwl_4/config.h";
chm = "nvim ~/.config/nixpkgs/per-user/kdam0-work/home.nix";
+ clsp = "nvim ~/.config/nixpkgs/common/nvim/plugins/lspconfig.lua";
search = "nix search nixpkgs $@";
conf = "ranger ~/.config/nixpkgs/common/";
up = "home-manager switch";
@@ -29,7 +28,16 @@
dns = "ssh administrator@ctrlf-dns";
pyans = "source ~/.venv/ansible/bin/activate";
pykep36 = "source ~/.venv/kepler36/bin/activate";
- };
+ };
+
+ programs.home-manager.enable = true;
+ programs.zsh = {
+ enable = true;
+ defaultKeymap = "viins";
+ initExtra = ''
+ source ${config.home.homeDirectory}/.p10k.zsh
+ bindkey '^ ' autosuggest-accept
+ '';
zplug = {
enable = true;
plugins = [
@@ -158,7 +166,7 @@
pkgs.acpi
# Other stuff
pkgs.entr
- pkgs.gcc
+ #pkgs.gcc
#stdenv.cc.cc.lib
#pkgs.libstdcxx5
#llvmPackages_6.libstdcxxClang
@@ -221,7 +229,7 @@
};
Service = {
Type = "simple";
- ExecStart = "${config.home.homeDirectory}/bg.sh";
+ ExecStart = "${config.home.homeDirectory}/.config/nixpkgs/common/scripts/walp";
TimeoutStopSec = "10";
KillMode = "process";
KillSignal = "SIGKILL";
@@ -247,8 +255,8 @@
# Source app specific configs
- home.file."bg.sh".source = ../../common/bg.sh;
- home.file."start.sh".source = ../../common/start.sh;
+ #home.file."bg.sh".source = ../../common/bg.sh;
+ #home.file."start.sh".source = ../../common/start.sh;
home.file.".config/foot/foot.ini".source = ../../common/foot/foot.ini;
home.file.".config/wofi/style.css".source = ../../common/wofi/style.css;
home.file.".config/mako/config".source = ../../common/mako/config;
@@ -257,5 +265,6 @@
#[colors]
#alpha=0.7
#'';
-}
+ targets.genericLinux.enable = true;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-02 10:24:02 +0000