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

things

Browse Source
This commit is contained in:
Simon Gardling 2024-10-29 12:55:21 -04:00
parent e789fc824d
commit 9e85e4fa22
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
7 changed files with 102 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
etcnixos/flake.lock generated
View File

@ -49,11 +49,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1728776144, "lastModified": 1730060262,
"narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "f876e3d905b922502f031aeec1a84490122254b7", "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,11 +233,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1729064530, "lastModified": 1730107060,
"narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +271,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1729742320, "lastModified": 1730161780,
"narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729878015, "lastModified": 1730218704,
"narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=", "narHash": "sha256-rAurlpnoe4bbg73RZRHjnAwVtz2LBWH/uEi9UY2sQyQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085", "rev": "963f723f4c5cf8267e0798630705eb87c1ac33fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,11 +331,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1728778939, "lastModified": 1729104314,
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,11 +362,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728959392, "lastModified": 1729996302,
"narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "rev": "a1b337569f334ff0a01b57627f17b201d746d24c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -392,11 +392,11 @@
}, },
"wivrn": { "wivrn": {
"locked": { "locked": {
"lastModified": 1729447101, "lastModified": 1729988849,
"narHash": "sha256-+amYWj/GpgYyYU1R2TTojPAXMNbCr93DVgVGcdIXgaQ=", "narHash": "sha256-5t+ZPFtNPpcNi02JOKLtvT0wx2IcaTWatJlJCb+rf0o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c41a27405aa44b94ba10c2002c20209e4911ff5", "rev": "adeeaf07e2742999b826a3126edd6ef366766464",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
etcnixos/vr.nix
View File

@ -5,17 +5,7 @@
openFirewall = true; openFirewall = true;
# WiVRn 0.20 # WiVRn 0.20
package = ( package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs;
inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs (old: {
patches = [
# Fixes build, see: https://github.com/NixOS/nixpkgs/pull/350069#issuecomment-2425149854
(pkgs.fetchurl {
url = "https://github.com/WiVRn/WiVRn/commit/d85916b6aaba3b4e9a7367e973b14f60507701fd.diff";
sha256 = "vm25kWfu2q1d7lL1zW8FNDUxUn25YpuoEYFbNChCWas=";
})
];
})
);
# Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications
# will automatically read this and work with wivrn # will automatically read this and work with wivrn

54
home-manager/flake.lock generated
View File

@ -72,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729864948, "lastModified": 1730016908,
"narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", "rev": "e83414058edd339148dc142a8437edb9450574c8",
"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": 1729841254, "lastModified": 1730208970,
"narHash": "sha256-KywrT/D1yMOLxc2xDJAPx9Z+qVoQw5rCScQR/lU3NTc=", "narHash": "sha256-Rz6l5qHcMZ8YfPfoFaC1GTVP2LaYjrjy85eH/2cxxQI=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "d7c058c0c0b8cd5b799a3a3ac4f8a1090454155e", "rev": "7e336c90d8e6ff2ea4b7f1db599cdf529a137770",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +131,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729744939, "lastModified": 1730139178,
"narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=", "narHash": "sha256-qivw/zu3aaRl8g3Y3VGpu1WwGr6/uPehIP8K4YTsirg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559", "rev": "6ecbf2db8a31484fe88b8faa399b9832da6c8a6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +146,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729878015, "lastModified": 1730220530,
"narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=", "narHash": "sha256-CRihEEXQNWxeo1uYmXWFR5RGUFiABbhFvuYX4RKX1J0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085", "rev": "885c7a77d4d1762cf456d4a7a77cb7061d412221",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +174,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1729691686, "lastModified": 1730137625,
"narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729823394, "lastModified": 1730169013,
"narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=", "narHash": "sha256-rvgF03ODu1uEYbdEsloN4fQrJ+k1NOv/7MJvCpHHnBk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f", "rev": "92eb1268cc19609f2fe24311b871f37bf3dc5afd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +253,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729838433, "lastModified": 1730166465,
"narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=", "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "67efa2c559b53d3ca90c131c06c247278783880d", "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,16 +268,16 @@
}, },
"zen-browser": { "zen-browser": {
"locked": { "locked": {
"lastModified": 1729379018, "lastModified": 1730058145,
"narHash": "sha256-lyGz9ul5QzJ40tUNXlHyvVowz3tbCgUPdfoi6ogq+DY=", "narHash": "sha256-msuIkiOd3D2bz/4zzCIKsoVDMp822HyMjE7s46nMX2Q=",
"owner": "matthewpi", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d607bf5d03a31601893680192c85eec359649ea2", "rev": "f7aceec47e062f753d0c53ca245da58576997354",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "matthewpi", "owner": "NixOS",
"ref": "zen-browser", "ref": "pull/347222/head",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
home-manager/flake.nix
View File

@ -28,7 +28,7 @@
zen-browser = { zen-browser = {
# https://github.com/NixOS/nixpkgs/pull/347222 # https://github.com/NixOS/nixpkgs/pull/347222
url = "github:matthewpi/nixpkgs/zen-browser"; url = "github:NixOS/nixpkgs/pull/347222/head";
}; };
}; };

40
home-manager/progs/niri.nix
View File

@ -21,7 +21,7 @@
}; };
spawn-at-startup = [ spawn-at-startup = [
# waybar # waybar (status bar)
{ 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)
@ -47,18 +47,27 @@
window-rules = [ window-rules = [
{ draw-border-with-background = false; } { draw-border-with-background = false; }
{ {
geometry-corner-radius = { geometry-corner-radius =
top-left = 10.0; let
top-right = 10.0; radius = 10.0;
bottom-right = 10.0; in
bottom-left = 10.0; {
}; top-left = radius;
top-right = radius;
bottom-right = radius;
bottom-left = radius;
};
} }
{ clip-to-geometry = true; } { clip-to-geometry = true; }
]; ];
# https://github.com/sodiboo/niri-flake/issues/591
# switch-events = with config.lib.niri.actions; {
# "lid-close" = spawn [ "${pkgs.swaylock}/bin/swaylock"];
# };
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"
@ -82,37 +91,38 @@
"-u" "-u"
"up" "up"
]; ];
"XF86AudioLowerVolume".action = spawn [ "XF86AudioLowerVolume".action = spawn [
"${pkgs.avizo}/bin/volumectl" "${pkgs.avizo}/bin/volumectl"
"-u" "-u"
"down" "down"
]; ];
"XF86AudioMute".action = spawn [ "XF86AudioMute".action = spawn [
"${pkgs.avizo}/bin/volumectl" "${pkgs.avizo}/bin/volumectl"
"toggle-mute" "toggle-mute"
]; ];
"XF86AudioMicMute".action = spawn [
"${pkgs.avizo}/bin/volumectl"
"-m"
"toggle-mute"
];
#Display Brightness control #Display Brightness control
"XF86MonBrightnessUp".action = spawn [ "XF86MonBrightnessUp".action = spawn [
"${pkgs.avizo}/bin/lightctl" "${pkgs.avizo}/bin/lightctl"
"up" "up"
]; ];
"XF86MonBrightnessDown".action = spawn [ "XF86MonBrightnessDown".action = spawn [
"${pkgs.avizo}/bin/lightctl" "${pkgs.avizo}/bin/lightctl"
"down" "down"
]; ];
# "Framework" key (F12)
# "XF86AudioMedia".action = spawn [];
# 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 window management
"Mod+Left".action = focus-column-left; "Mod+Left".action = focus-column-left;
"Mod+Down".action = focus-window-down; "Mod+Down".action = focus-window-down;
@ -177,7 +187,7 @@
"Mod+Ctrl+U".action = move-column-to-workspace-down; "Mod+Ctrl+U".action = move-column-to-workspace-down;
"Mod+Ctrl+I".action = move-column-to-workspace-up; "Mod+Ctrl+I".action = move-column-to-workspace-up;
#does little squeeze thing into the left or right position with another window # does little squeeze thing into the left or right position with another window
"Mod+BracketLeft".action = consume-or-expel-window-left; "Mod+BracketLeft".action = consume-or-expel-window-left;
"Mod+BracketRight".action = consume-or-expel-window-right; "Mod+BracketRight".action = consume-or-expel-window-right;

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

@ -11,9 +11,10 @@
margin-bottom = -1; margin-bottom = -1;
# passthrough = false; # passthrough = false;
height = 32; height = 32;
modules-left = modules-left = [
[ "niri/workspaces"
]; "niri/window"
];
modules-center = [ "clock" ]; modules-center = [ "clock" ];
modules-right = [ modules-right = [
"cpu" "cpu"
@ -24,11 +25,27 @@
"network" "network"
"battery" "battery"
]; ];
"niri/workspaces" = {
format = "{icon}";
format-icons = {
# Icons by state
active = "";
default = "";
};
};
"niri/window" = {
format = "{}";
};
cpu = { cpu = {
interval = 5; interval = 5;
format = " {usage}%"; format = " {usage}%";
max-length = 10; max-length = 10;
}; };
memory = { memory = {
interval = 10; interval = 10;
format = " {percentage}%"; format = " {percentage}%";
@ -36,10 +53,12 @@
tooltip = true; tooltip = true;
tooltip-format = "RAM - {used:0.1f}GiB used"; tooltip-format = "RAM - {used:0.1f}GiB used";
}; };
tray = { tray = {
icon-size = 18; icon-size = 18;
spacing = 3; spacing = 3;
}; };
clock = { clock = {
format = " {:%R\n %d.%m.%Y}"; format = " {:%R\n %d.%m.%Y}";
tooltip-format = "<tt><small>{calendar}</small></tt>"; tooltip-format = "<tt><small>{calendar}</small></tt>";
@ -57,6 +76,7 @@
today = "<span color='#ff6699'><b><u>{}</u></b></span>"; today = "<span color='#ff6699'><b><u>{}</u></b></span>";
}; };
}; };
actions = { actions = {
on-click-right = "mode"; on-click-right = "mode";
on-click-forward = "tz_up"; on-click-forward = "tz_up";

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

@ -22,10 +22,14 @@
wdisplays wdisplays
intel-gpu-tools intel-gpu-tools
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
]; ];
services.blueman-applet.enable = true;
# media controls # media controls
systemd.user.services.mpris-proxy = { systemd.user.services.mpris-proxy = {
Unit.Description = "Mpris proxy"; Unit.Description = "Mpris proxy";