titaniumtown/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more overhaul

Browse Source
This commit is contained in:
Simon Gardling 2024-10-25 14:15:48 -04:00
parent bfa8fb6184
commit e789fc824d
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
5 changed files with 341 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
etcnixos/flake.lock generated
View File

@ -33,11 +33,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729348269, "lastModified": 1729599319,
"narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=", "narHash": "sha256-e/4JPcIRte5zkwqmGFrFo3763e0iHURX6N0apz4jbI0=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "528723447ef037a1c081add43f4fd46440c9c3b1", "rev": "1b86b304c8eb1437d9337a760e7f930826fc4d6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729027341, "lastModified": 1729414726,
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "rev": "fe56302339bb28e3471632379d733547caec8103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728974938, "lastModified": 1729177642,
"narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "23170582b0658e6afd913149a58863af3a57b376", "rev": "bb69165ff372ddbd3228a03513922acd783040e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +271,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1729455275, "lastModified": 1729742320,
"narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729471405, "lastModified": 1729878015,
"narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085",
"type": "github" "type": "github"
}, },
"original": { "original": {

42
home-manager/flake.lock generated
View File

@ -72,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729459288, "lastModified": 1729864948,
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1729450307, "lastModified": 1729841254,
"narHash": "sha256-jhpL4ttlp8kxBurzfdlNsnI0n3iOkpy0iDaSMG1DzqE=", "narHash": "sha256-KywrT/D1yMOLxc2xDJAPx9Z+qVoQw5rCScQR/lU3NTc=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "bfe9f1a9906e66c83cb073d281920e902cd63e01", "rev": "d7c058c0c0b8cd5b799a3a3ac4f8a1090454155e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +131,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729444736, "lastModified": 1729744939,
"narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=", "narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af", "rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +146,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729471405, "lastModified": 1729878015,
"narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +174,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1729181673, "lastModified": 1729691686,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729391507, "lastModified": 1729823394,
"narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", "narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "784981a9feeba406de38c1c9a3decf966d853cca", "rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +253,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729139001, "lastModified": 1729838433,
"narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=", "narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499", "rev": "67efa2c559b53d3ca90c131c06c247278783880d",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
home-manager/progs/swaylock.nix
View File

@ -1,4 +1,8 @@
{ pkgs, ... }:
{ {
programs.swaylock = {
enable = true;
settings = {
color = "24273a"; color = "24273a";
bs-hl-color = "f4dbd6"; bs-hl-color = "f4dbd6";
caps-lock-bs-hl-color = "f4dbd6"; caps-lock-bs-hl-color = "f4dbd6";
@ -28,4 +32,6 @@
text-caps-lock-color = "f5a97f"; text-caps-lock-color = "f5a97f";
text-ver-color = "8aadf4"; text-ver-color = "8aadf4";
text-wrong-color = "ee99a0"; text-wrong-color = "ee99a0";
};
};
} }

5
home-manager/progs/waybar.nix
View File

@ -1,5 +1,6 @@
{ pkgs }: { pkgs, ... }:
{ {
programs.waybar = {
enable = true; enable = true;
settings.mainBar = { settings.mainBar = {
layer = "top"; layer = "top";
@ -130,6 +131,7 @@
tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}";
tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; tooltip-format-enumerate-connected = "{device_alias}\t{device_address}";
tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%";
on-click = "${pkgs.blueman}/bin/blueman-manager"; on-click = "${pkgs.blueman}/bin/blueman-manager";
}; };
}; };
@ -267,4 +269,5 @@
background: @bg_hover; background: @bg_hover;
} }
''; '';
};
} }

26
home-manager/system-mreow.nix
View File

@ -8,25 +8,25 @@
{ {
imports = [ imports = [
./gui.nix ./gui.nix
# niri wayland compositor
./progs/niri.nix ./progs/niri.nix
# waybar for status bar
./progs/waybar.nix
./progs/swaylock.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
wdisplays wdisplays
intel-gpu-tools intel-gpu-tools
swaylock
# manage bluetooth devices
blueman
# used by /etc/nixos logic to launch niri # used by /etc/nixos logic to launch niri
config.programs.niri.package config.programs.niri.package
]; ];
# # bluetooth manager # media controls
# services.blueman-applet.enable = true;
# bluetooth media controls
systemd.user.services.mpris-proxy = { systemd.user.services.mpris-proxy = {
Unit.Description = "Mpris proxy"; Unit.Description = "Mpris proxy";
Install.After = [ Install.After = [
@ -43,14 +43,6 @@
package = pkgs.dunst; package = pkgs.dunst;
}; };
programs.swaylock = {
enable = true;
settings = import ./progs/swaylock.nix;
};
# waybar for status bar
programs.waybar = import ./progs/waybar.nix { inherit pkgs; };
# rofi for application launcher # rofi for application launcher
programs.rofi = { programs.rofi = {
enable = true; enable = true;
@ -88,7 +80,7 @@
# Filter: ON PK Fc 7500.0 Hz Gain -2.09 dB Q 3.0 # Filter: ON PK Fc 7500.0 Hz Gain -2.09 dB Q 3.0
# Filter: ON PK Fc 8000.0 Hz Gain 2.01 dB Q 4.36 # Filter: ON PK Fc 8000.0 Hz Gain 2.01 dB Q 4.36
# Filter: ON PK Fc 900.0 Hz Gain -4.12 dB Q 5.909999999999967 # Filter: ON PK Fc 900.0 Hz Gain -4.12 dB Q 5.909999999999967
home.file.".config/easyeffects/output/framework.json".text = home.file.".config/easyeffects/output/${config.services.easyeffects.preset}.json".text =
let let
baseBand = { baseBand = {
mode = "RLC (BT)"; mode = "RLC (BT)";