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

cleanup

Browse Source
This commit is contained in:
Simon Gardling 2024-09-17 09:42:28 -04:00
parent 63fd46b9f8
commit 00b8680745
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
9 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nix/etcnixos/flake.lock generated
View File

@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726434563, "lastModified": 1726523817,
"narHash": "sha256-RtcOyhSkgGnrPQ/0xCcsbpgo+AZR81fjtR1wj5qXqYU=", "narHash": "sha256-5KueNk96kOJ+Y2n2jZhNd2mdJbPQe3Y8pu1ZRkUCZNQ=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "93e6cdc6335d9c7652e89466b5e05a3cce836906", "rev": "6c47675209ab684a05adcd6cee50d3d64247280d",
"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": 1726230467, "lastModified": 1726468443,
"narHash": "sha256-YyMNF7IFyysZ2KeqEO6AmV3nQeaDSxyNXLdHp1ghO60=", "narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "43efa7a3a97f290441bd75b18defcd4f7b8df220", "rev": "effac20e9560aab202e82b6d833f685163a9c138",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726222338, "lastModified": 1726440980,
"narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=", "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "503af483e1b328691ea3a434d331995595fb2e3d", "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,16 +332,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726578198,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-x+B/GJ9wc4qrq8PfTaYVnthwyaXmajCB2aGYiF2YKAM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "058f7222f15e3804199fb3ede267cb0368487a33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -402,11 +402,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725985110, "lastModified": 1726443025,
"narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=", "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8", "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
nix/etcnixos/flake.nix
View File

@ -2,13 +2,15 @@
description = "A simple NixOS flake"; description = "A simple NixOS flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/master";
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote"; url = "github:nix-community/lanzaboote";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
alvr.url = "github:NixOS/nixpkgs/pull/308097/head"; alvr.url = "github:NixOS/nixpkgs/pull/308097/head";
chaotic = { chaotic = {

42
nix/home-manager/flake.lock generated
View File

@ -33,11 +33,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726474477, "lastModified": 1726574742,
"narHash": "sha256-XJBH15VxAXFqILdoI1pq4p2ShGsiyds6fDvuytAT9Fg=", "narHash": "sha256-eWANP6s59C3tAMrExHwL7Sap51XUz/0f1cfGysXGnxA=",
"owner": "orhun", "owner": "orhun",
"repo": "binsider", "repo": "binsider",
"rev": "29d88dc85ee92f6c42b040cf2dd7a38f1ebf2d6a", "rev": "31797519bd6ff5df0a4d9d530a25411597ca2915",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
"firefox-mod-theme": { "firefox-mod-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726262539, "lastModified": 1726524227,
"narHash": "sha256-cqV/tJ9bDionSX8KzMj1dv2LRGSXcQ/xV3CWTn/elhQ=", "narHash": "sha256-3d+dJVvOqMO+egFrEY1fdCeFpkVvsRvXoOs3rPnI/sc=",
"owner": "datguypiko", "owner": "datguypiko",
"repo": "Firefox-Mod-Blur", "repo": "Firefox-Mod-Blur",
"rev": "cbbaa4dc54a060a01b69d096cf7039d8c7aef5f0", "rev": "9440b653bdb450f2b756c3978d76d194ba8cd2ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,11 +153,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1726426731, "lastModified": 1726548583,
"narHash": "sha256-h3m3ld3Awh8PzBPWV1i7/DtxGVTIjBMxCjPKQTr5W4Q=", "narHash": "sha256-jJ0dMdLIyh+4Vrn2S4yvFbhfCAOMDe2kKlQwFoQytEs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "fd00de202cc0287f7b34c237b8585e67fe7b85f7", "rev": "787b96e1294932241a9c05ecdea0ae784b33cea6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,16 +201,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726578198,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-x+B/GJ9wc4qrq8PfTaYVnthwyaXmajCB2aGYiF2YKAM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "058f7222f15e3804199fb3ede267cb0368487a33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -281,11 +281,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726453838, "lastModified": 1726539203,
"narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", "narHash": "sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", "rev": "20c8461785d8f5af32d8d4d5c128589e23d7f033",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,15 +381,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726505190, "lastModified": 1726556131,
"narHash": "sha256-cJ2h68WZ1dlPjwBfWxo8+uKUiW6ANOQNtA2gD88u/7c=", "narHash": "sha256-8pw8YO3TdPAc3kFivG51c3sJ4WU49G5xRVA/SxZTAdk=",
"owner": "clementpoiret", "owner": "ch4og",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "34b874e80aa2d1e5b08fbce376f4d398971b6d74", "rev": "c7b0aadb81cbc9ea10a650bf9f3485b94bb6e864",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "clementpoiret", "owner": "ch4og",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"type": "github" "type": "github"
} }

5
nix/home-manager/flake.nix
View File

@ -2,7 +2,8 @@
description = "My nixOS flake for home-manager"; description = "My nixOS flake for home-manager";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -32,7 +33,7 @@
zen-browser = { zen-browser = {
# url = "github:MarceColl/zen-browser-flake"; # url = "github:MarceColl/zen-browser-flake";
url = "github:clementpoiret/zen-browser-flake"; url = "github:ch4og/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

12
nix/home-manager/gui.nix
View File

@ -102,7 +102,7 @@
puddletag puddletag
inputs.zen-browser.packages."${system}".specific inputs.zen-browser.packages."${pkgs.system}".specific
(factorio.override ( (factorio.override (
let let
@ -129,16 +129,6 @@
TERMINAL = "alacritty"; TERMINAL = "alacritty";
}; };
#rofi for application launcher
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
extraConfig = {
modi = "window,drun,ssh,combi";
combi-modi = "window,drun,ssh";
};
};
#Terminal emulator #Terminal emulator
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;

11
nix/home-manager/progs/borg.nix
View File

@ -9,18 +9,19 @@
# stuff in my home directory: # stuff in my home directory:
++ (map (f: "${homeDirectory}/${f}") [ ++ (map (f: "${homeDirectory}/${f}") [
".zen" ".zen"
"dotfiles" ".local/share/fish"
".gnupg"
".config/home-manager" ".config/home-manager"
".config/Signal" ".config/Signal"
".wallpaper.png"
".ssh"
"dotfiles"
"Documents" "Documents"
"projects" "projects"
"Pictures" "Pictures"
"school" "school"
".wallpaper.png"
".ssh"
"justfile" "justfile"
".local/share/fish"
".gnupg"
]); ]);
excludeHomeManagerSymlinks = true; excludeHomeManagerSymlinks = true;

46
nix/home-manager/progs/fish.nix
View File

@ -13,30 +13,34 @@
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
''; '';
shellAliases = { shellAliases =
c = "${pkgs.cargo}/bin/cargo"; let
cr = "${pkgs.cargo}/bin/cargo run"; eza_common = "${pkgs.eza}/bin/eza --color=always --group-directories-first";
cb = "${pkgs.cargo}/bin/cargo build"; in
{
c = "${pkgs.cargo}/bin/cargo";
cr = "${pkgs.cargo}/bin/cargo run";
cb = "${pkgs.cargo}/bin/cargo build";
# from DistroTube's dot files: Changing "ls" to "eza" # from DistroTube's dot files: Changing "ls" to "eza"
ls = "${pkgs.eza}/bin/eza -al --color=always --group-directories-first"; ls = "${eza_common} -al";
la = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first"; la = "${eza_common} -a";
ll = "${pkgs.eza}/bin/eza -l --color=always --group-directories-first"; ll = "${eza_common} -l";
lt = "${pkgs.eza}/bin/eza -aT --color=always --group-directories-first"; lt = "${eza_common} -aT";
# gets the largest files in a git repo's history # gets the largest files in a git repo's history
"git-size" = '' "git-size" = ''
${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' |
${pkgs.coreutils}/bin/sort --numeric-sort --key=2 | ${pkgs.coreutils}/bin/sort --numeric-sort --key=2 |
${pkgs.coreutils}/bin/cut -c 1-12,41- | ${pkgs.coreutils}/bin/cut -c 1-12,41- |
${pkgs.coreutils}/bin/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; ${pkgs.coreutils}/bin/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";
}; };
shellInit = '' shellInit = ''
fish_add_path ~/.local/bin fish_add_path ~/.local/bin

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

@ -38,7 +38,7 @@
binds = with config.lib.niri.actions; { binds = with config.lib.niri.actions; {
#application launcher #application launcher
"Mod+Space".action = spawn [ "Mod+Space".action = spawn [
"rofi" "${pkgs.rofi-wayland}/bin/rofi"
"-show" "-show"
"combi" "combi"
]; ];

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

@ -39,6 +39,16 @@
#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
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
extraConfig = {
modi = "window,drun,ssh,combi";
combi-modi = "window,drun,ssh";
};
};
age.secrets.borg-laptop-password = { age.secrets.borg-laptop-password = {
file = ./secrets/borg-laptop-password.age; file = ./secrets/borg-laptop-password.age;
path = "${homeDirectory}/.secrets/borg_bak_pass"; path = "${homeDirectory}/.secrets/borg_bak_pass";