This commit is contained in:
Simon Gardling 2024-10-10 00:35:46 -04:00
parent 7ba187dff3
commit 3c08138ccc
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
6 changed files with 42 additions and 42 deletions

30
etcnixos/flake.lock generated
View File

@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728392601, "lastModified": 1728518869,
"narHash": "sha256-0ZuowheyMfLuxr4ViAWiKjs0aow1pn8xtKlsYx+NVR4=", "narHash": "sha256-E3UDvOmDuADBDxJIzPKiUmKC2CLoVvWP+9gjlw5xS8Y=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "147c0997fe3451b09fa30c47afa1577f91aa7524", "rev": "8bfc88598cfc49588de18099d7962c623cb86310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,11 +116,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1728196311, "lastModified": 1728455642,
"narHash": "sha256-JoDDlmjPj0sGo1beOo3bRh7BDppm0Kuet7I7BqTmSl4=", "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "26971356e387b5ec0578f52be1bbd82ecf6dbad4", "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728041527, "lastModified": 1728337164,
"narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +253,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728183036, "lastModified": 1728410210,
"narHash": "sha256-aq8i8LCbbo2gIBcFiMTFxyE4fdAKrjFU1c//zZn0bZM=", "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "751641e82a34709ed2a177e69e23b1ea08a75561", "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728064742, "lastModified": 1728386838,
"narHash": "sha256-tFvUGvqUZjES1yxYT2zEFiTAE0iQKYd+eWKX/6ZqeVw=", "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "5982d9c420d0dc90739171829f0d2e9c80d98979", "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728461096, "lastModified": 1728527353,
"narHash": "sha256-cd0cXB85B3kGpm+iumP9xCnqFErspXL9Z/2X59kQ6c4=", "narHash": "sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e310b9bd71fa6c6a9fec0a8cf5af43ce798a0ad6", "rev": "94749eee5a2b351b6893d5bddb0a18f7f01251ac",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -2,7 +2,7 @@
let let
eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first";
cargo = "${pkgs.cargo}/bin/cargo"; cargo = "${pkgs.cargo}/bin/cargo";
coreutil = "${pkgs.coreutils}/bin"; coreutils = "${pkgs.coreutils}/bin";
in in
{ {
programs.fish = { programs.fish = {
@ -13,7 +13,7 @@ in
set fish_greeting set fish_greeting
#fixes gnupg password entry #fixes gnupg password entry
export GPG_TTY=(${coreutil}/tty) export GPG_TTY=(${coreutils}/tty)
#pfetch on shell start (disable pkgs because of execution time) #pfetch on shell start (disable pkgs because of execution time)
PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch
@ -38,11 +38,11 @@ in
${pkgs.git}/bin/git rev-list --objects --all | ${pkgs.git}/bin/git rev-list --objects --all |
${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' |
${pkgs.gnused}/bin/sed -n 's/^blob //p' | ${pkgs.gnused}/bin/sed -n 's/^blob //p' |
${coreutil}/sort --numeric-sort --key=2 | ${coreutils}/sort --numeric-sort --key=2 |
${coreutil}/cut -c 1-12,41- | ${coreutils}/cut -c 1-12,41- |
${coreutil}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; ${coreutils}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest'';
#aliases for (I think) macos commands # aliases for (I think) macos commands
pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy";
pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";

View File

@ -16,7 +16,7 @@
hidden = false; hidden = false;
}; };
#wrapping!! # wrapping!!
soft-wrap.enable = true; soft-wrap.enable = true;
}; };
}; };
@ -31,7 +31,7 @@
}; };
themes = { themes = {
#modified fleet_dark theme # modified fleet_dark theme
my_theme = my_theme =
let let
white = "#ffffff"; white = "#ffffff";

View File

@ -7,10 +7,10 @@
prefer-no-csd = true; prefer-no-csd = true;
spawn-at-startup = [ spawn-at-startup = [
#waybar # waybar
{ command = [ "${pkgs.waybar}/bin/waybar" ]; } { command = [ "${pkgs.waybar}/bin/waybar" ]; }
#swaybg works on more than just sway (sets a wallpaper) # swaybg works on more than just sway (sets a wallpaper)
{ {
command = [ command = [
"${pkgs.swaybg}/bin/swaybg" "${pkgs.swaybg}/bin/swaybg"
@ -36,25 +36,25 @@
]; ];
binds = with config.lib.niri.actions; { binds = with config.lib.niri.actions; {
#application launcher # application launcher
"Mod+Space".action = spawn [ "Mod+Space".action = spawn [
"${pkgs.rofi-wayland}/bin/rofi" "${pkgs.rofi-wayland}/bin/rofi"
"-show" "-show"
"combi" "combi"
]; ];
#open a terminal # open a terminal
"Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty";
#lock the screen # lock the screen
"Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock"; "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock";
#screenshotting # screenshotting
"Print".action = screenshot; "Print".action = screenshot;
"Ctrl+Print".action = screenshot-screen; "Ctrl+Print".action = screenshot-screen;
"Alt+Print".action = screenshot-window; "Alt+Print".action = screenshot-window;
#Volume control # Volume control
"XF86AudioRaiseVolume".action = spawn [ "XF86AudioRaiseVolume".action = spawn [
"${pkgs.avizo}/bin/volumectl" "${pkgs.avizo}/bin/volumectl"
"-u" "-u"
@ -85,12 +85,12 @@
"down" "down"
]; ];
#Force close a window # Force close a window
"Mod+Q".action = close-window; "Mod+Q".action = close-window;
"Mod+Shift+Q".action = quit; "Mod+Shift+Q".action = quit;
#bindings for like window management ig # bindings for like window management ig
"Mod+Left".action = focus-column-left; "Mod+Left".action = focus-column-left;
"Mod+Down".action = focus-window-down; "Mod+Down".action = focus-window-down;

View File

@ -13,22 +13,22 @@
intel-gpu-tools intel-gpu-tools
swaylock swaylock
#manage bluetooth devices # manage bluetooth devices
blueman blueman
niri niri
]; ];
#bluetooth manager # bluetooth manager
services.blueman-applet.enable = true; services.blueman-applet.enable = true;
#notification daemon # notification daemon
services.dunst = { services.dunst = {
enable = true; enable = true;
package = pkgs.dunst; package = pkgs.dunst;
}; };
#window manager # window manager
programs.niri = { programs.niri = {
settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; };
}; };
@ -38,10 +38,10 @@
settings = import ./progs/swaylock.nix; settings = import ./progs/swaylock.nix;
}; };
#waybar for status bar # waybar for status bar
programs.waybar = import ./progs/waybar.nix { inherit pkgs; }; programs.waybar = import ./progs/waybar.nix { inherit pkgs; };
#rofi for application launcher # rofi for application launcher
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
@ -56,7 +56,7 @@
path = "${homeDirectory}/.secrets/borg_bak_pass"; path = "${homeDirectory}/.secrets/borg_bak_pass";
}; };
#backup utility # backup utility
programs.borgmatic = { programs.borgmatic = {
enable = true; enable = true;
package = pkgs.borgmatic; package = pkgs.borgmatic;