diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock index 2c5fe96..7a7c018 100644 --- a/nix/etcnixos/flake.lock +++ b/nix/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1726434563, - "narHash": "sha256-RtcOyhSkgGnrPQ/0xCcsbpgo+AZR81fjtR1wj5qXqYU=", + "lastModified": 1726523817, + "narHash": "sha256-5KueNk96kOJ+Y2n2jZhNd2mdJbPQe3Y8pu1ZRkUCZNQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "93e6cdc6335d9c7652e89466b5e05a3cce836906", + "rev": "6c47675209ab684a05adcd6cee50d3d64247280d", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1726230467, - "narHash": "sha256-YyMNF7IFyysZ2KeqEO6AmV3nQeaDSxyNXLdHp1ghO60=", + "lastModified": 1726468443, + "narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=", "owner": "nix-community", "repo": "fenix", - "rev": "43efa7a3a97f290441bd75b18defcd4f7b8df220", + "rev": "effac20e9560aab202e82b6d833f685163a9c138", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1726222338, - "narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "503af483e1b328691ea3a434d331995595fb2e3d", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -332,16 +332,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726578198, + "narHash": "sha256-x+B/GJ9wc4qrq8PfTaYVnthwyaXmajCB2aGYiF2YKAM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "058f7222f15e3804199fb3ede267cb0368487a33", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -402,11 +402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1725985110, - "narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=", + "lastModified": 1726443025, + "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8", + "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", "type": "github" }, "original": { diff --git a/nix/etcnixos/flake.nix b/nix/etcnixos/flake.nix index 4906bd3..0f2ed4a 100644 --- a/nix/etcnixos/flake.nix +++ b/nix/etcnixos/flake.nix @@ -2,13 +2,15 @@ description = "A simple NixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/master"; lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + alvr.url = "github:NixOS/nixpkgs/pull/308097/head"; chaotic = { diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index fb32c9c..16e5426 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1726474477, - "narHash": "sha256-XJBH15VxAXFqILdoI1pq4p2ShGsiyds6fDvuytAT9Fg=", + "lastModified": 1726574742, + "narHash": "sha256-eWANP6s59C3tAMrExHwL7Sap51XUz/0f1cfGysXGnxA=", "owner": "orhun", "repo": "binsider", - "rev": "29d88dc85ee92f6c42b040cf2dd7a38f1ebf2d6a", + "rev": "31797519bd6ff5df0a4d9d530a25411597ca2915", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "firefox-mod-theme": { "flake": false, "locked": { - "lastModified": 1726262539, - "narHash": "sha256-cqV/tJ9bDionSX8KzMj1dv2LRGSXcQ/xV3CWTn/elhQ=", + "lastModified": 1726524227, + "narHash": "sha256-3d+dJVvOqMO+egFrEY1fdCeFpkVvsRvXoOs3rPnI/sc=", "owner": "datguypiko", "repo": "Firefox-Mod-Blur", - "rev": "cbbaa4dc54a060a01b69d096cf7039d8c7aef5f0", + "rev": "9440b653bdb450f2b756c3978d76d194ba8cd2ed", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1726426731, - "narHash": "sha256-h3m3ld3Awh8PzBPWV1i7/DtxGVTIjBMxCjPKQTr5W4Q=", + "lastModified": 1726548583, + "narHash": "sha256-jJ0dMdLIyh+4Vrn2S4yvFbhfCAOMDe2kKlQwFoQytEs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fd00de202cc0287f7b34c237b8585e67fe7b85f7", + "rev": "787b96e1294932241a9c05ecdea0ae784b33cea6", "type": "github" }, "original": { @@ -201,16 +201,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726578198, + "narHash": "sha256-x+B/GJ9wc4qrq8PfTaYVnthwyaXmajCB2aGYiF2YKAM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "058f7222f15e3804199fb3ede267cb0368487a33", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1726453838, - "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "lastModified": 1726539203, + "narHash": "sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "rev": "20c8461785d8f5af32d8d4d5c128589e23d7f033", "type": "github" }, "original": { @@ -381,15 +381,15 @@ ] }, "locked": { - "lastModified": 1726505190, - "narHash": "sha256-cJ2h68WZ1dlPjwBfWxo8+uKUiW6ANOQNtA2gD88u/7c=", - "owner": "clementpoiret", + "lastModified": 1726556131, + "narHash": "sha256-8pw8YO3TdPAc3kFivG51c3sJ4WU49G5xRVA/SxZTAdk=", + "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "34b874e80aa2d1e5b08fbce376f4d398971b6d74", + "rev": "c7b0aadb81cbc9ea10a650bf9f3485b94bb6e864", "type": "github" }, "original": { - "owner": "clementpoiret", + "owner": "ch4og", "repo": "zen-browser-flake", "type": "github" } diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 3794242..479e969 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -2,7 +2,8 @@ description = "My nixOS flake for home-manager"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/master"; home-manager = { url = "github:nix-community/home-manager"; @@ -32,7 +33,7 @@ zen-browser = { # url = "github:MarceColl/zen-browser-flake"; - url = "github:clementpoiret/zen-browser-flake"; + url = "github:ch4og/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/nix/home-manager/gui.nix b/nix/home-manager/gui.nix index 8e2ba68..3d0ec04 100644 --- a/nix/home-manager/gui.nix +++ b/nix/home-manager/gui.nix @@ -102,7 +102,7 @@ puddletag - inputs.zen-browser.packages."${system}".specific + inputs.zen-browser.packages."${pkgs.system}".specific (factorio.override ( let @@ -129,16 +129,6 @@ 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 programs.alacritty = { enable = true; diff --git a/nix/home-manager/progs/borg.nix b/nix/home-manager/progs/borg.nix index e901bff..23b8723 100644 --- a/nix/home-manager/progs/borg.nix +++ b/nix/home-manager/progs/borg.nix @@ -9,18 +9,19 @@ # stuff in my home directory: ++ (map (f: "${homeDirectory}/${f}") [ ".zen" - "dotfiles" + ".local/share/fish" + ".gnupg" ".config/home-manager" ".config/Signal" + ".wallpaper.png" + ".ssh" + + "dotfiles" "Documents" "projects" "Pictures" "school" - ".wallpaper.png" - ".ssh" "justfile" - ".local/share/fish" - ".gnupg" ]); excludeHomeManagerSymlinks = true; diff --git a/nix/home-manager/progs/fish.nix b/nix/home-manager/progs/fish.nix index 1e76482..05228f3 100644 --- a/nix/home-manager/progs/fish.nix +++ b/nix/home-manager/progs/fish.nix @@ -13,30 +13,34 @@ PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch ''; - shellAliases = { - c = "${pkgs.cargo}/bin/cargo"; - cr = "${pkgs.cargo}/bin/cargo run"; - cb = "${pkgs.cargo}/bin/cargo build"; + shellAliases = + let + eza_common = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; + 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" - ls = "${pkgs.eza}/bin/eza -al --color=always --group-directories-first"; - la = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first"; - ll = "${pkgs.eza}/bin/eza -l --color=always --group-directories-first"; - lt = "${pkgs.eza}/bin/eza -aT --color=always --group-directories-first"; + # from DistroTube's dot files: Changing "ls" to "eza" + ls = "${eza_common} -al"; + la = "${eza_common} -a"; + ll = "${eza_common} -l"; + lt = "${eza_common} -aT"; - # gets the largest files in a git repo's history - "git-size" = '' - ${pkgs.git}/bin/git rev-list --objects --all | - ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | - ${pkgs.gnused}/bin/sed -n 's/^blob //p' | - ${pkgs.coreutils}/bin/sort --numeric-sort --key=2 | - ${pkgs.coreutils}/bin/cut -c 1-12,41- | - ${pkgs.coreutils}/bin/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; + # gets the largest files in a git repo's history + "git-size" = '' + ${pkgs.git}/bin/git rev-list --objects --all | + ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | + ${pkgs.gnused}/bin/sed -n 's/^blob //p' | + ${pkgs.coreutils}/bin/sort --numeric-sort --key=2 | + ${pkgs.coreutils}/bin/cut -c 1-12,41- | + ${pkgs.coreutils}/bin/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; - #aliases for (I think) macos commands - pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; - pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; - }; + #aliases for (I think) macos commands + pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; + pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; + }; shellInit = '' fish_add_path ~/.local/bin diff --git a/nix/home-manager/progs/niri.nix b/nix/home-manager/progs/niri.nix index f7b766b..a6aa705 100644 --- a/nix/home-manager/progs/niri.nix +++ b/nix/home-manager/progs/niri.nix @@ -38,7 +38,7 @@ binds = with config.lib.niri.actions; { #application launcher "Mod+Space".action = spawn [ - "rofi" + "${pkgs.rofi-wayland}/bin/rofi" "-show" "combi" ]; diff --git a/nix/home-manager/system-mreow.nix b/nix/home-manager/system-mreow.nix index 1e86a3b..b68dab0 100644 --- a/nix/home-manager/system-mreow.nix +++ b/nix/home-manager/system-mreow.nix @@ -39,6 +39,16 @@ #waybar for status bar 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 = { file = ./secrets/borg-laptop-password.age; path = "${homeDirectory}/.secrets/borg_bak_pass";