diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 274e694..ce31284 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1732400024, - "narHash": "sha256-uf1QzIl0Jj5dr7+erWjHWiCUEvywLaR7ir1jcqGgjeQ=", + "lastModified": 1733319615, + "narHash": "sha256-QWQPdJiC6ab3J2rThuLoFJivkEOvMNkzOIn5qJLhIQg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc", + "rev": "d6a32b476215dbe915ccfa123fcd16d59d21a2c6", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1732303962, - "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1732032028, - "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", + "lastModified": 1732739177, + "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "65dc04371cf914c9af4f073638821e4787303005", + "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1732308363, - "narHash": "sha256-o/qgBWJ1JSeWvdcTqdqMDttoggejk25UnzHiaGrfZUU=", + "lastModified": 1733023508, + "narHash": "sha256-z2bFIHL2wkuZKuOZvN1jqcTxFdyGo1Ps5Q0OKFqQsvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c37b4d31e8531260cfe3d80a39cd9d62ecb547b", + "rev": "b6991a56cb742bc8237db48578dd281224e01b94", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index aa00cec..259a7c7 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -112,4 +112,9 @@ ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${config.boot.lanzaboote.pkiBundle} ''; }; + + # https://github.com/NixOS/nixos-hardware/pull/1253 + # hardware.framework.laptop13.audioEnhancement = { + # enable = true; + # }; } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 6d6204f..e5fa70b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1732397793, - "narHash": "sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF+5mroU=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "92fef254a9071fa41a13908281284e6a62b9c92e", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1732366896, - "narHash": "sha256-dQrHznGma8aWeBESRUCc1onWYoGrM35GDl/uwEB7eG8=", + "lastModified": 1733474926, + "narHash": "sha256-OYp5iaVJc13jEndTrTRVq/C5jNLLW4B4bwJVRNJRsdU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3131d857c946c75557f5b6fb99a113b6949ea04d", + "rev": "5a93128d0685e0582428b573bb67f601b11b2ca0", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1732363756, - "narHash": "sha256-/E2aRhcvlH2PkkpC2n79UCMZyIkQKWfG4m//UHkeNgU=", + "lastModified": 1733234028, + "narHash": "sha256-YITDP4Jr+sWuQ29WudIBDci7Mh6Ro70XcwYVkxQ1VVU=", "owner": "YaLTeR", "repo": "niri", - "rev": "9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4", + "rev": "34ce6d0b02420a8e4a5394cb4c4c603b6efef221", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733220138, + "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -157,6 +157,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -174,11 +190,11 @@ ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1733452419, + "narHash": "sha256-eh2i2GtqdWVOP7yjiWtB8FMUWktCZ4vjo81n6g5mSiE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "020701e6057992329a7cfafc6e3c5d5658bbcf79", "type": "github" }, "original": { @@ -236,18 +252,20 @@ } }, "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1731699950, - "narHash": "sha256-xrH3kz0hhu60CS/MnSWXn6R5NnUFYthWktQ0e8ljxb0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4a6be22d0d52df01d0be2346cc6504962251fea7", + "lastModified": 1732933979, + "narHash": "sha256-Z7X++lKZMNBu67BJl2LP23e7RBadp2C/RuRrygLehaE=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "5a765451af1db68acceae07b98e5c768f238210c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "pull/347222/head", - "repo": "nixpkgs", + "owner": "0xc000022070", + "repo": "zen-browser-flake", "type": "github" } } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 37ae0c4..821e55b 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -26,10 +26,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser = { - # https://github.com/NixOS/nixpkgs/pull/347222 - url = "github:NixOS/nixpkgs/pull/347222/head"; - }; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; + }; outputs = diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 32206f0..affeb05 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -20,84 +20,85 @@ "apple_cursor" ]; - home.packages = with pkgs; [ - #calculator - gnome-calculator + home.packages = + with pkgs; + [ + #calculator + gnome-calculator - #productivity stuff - libreoffice - hunspell # spellcheck - hunspellDicts.en_US # spellcheck dictionary + #productivity stuff + libreoffice + hunspell # spellcheck + hunspellDicts.en_US # spellcheck dictionary - #video and audio downloading - parabolic + #video and audio downloading + parabolic - #soulseek client - nicotine-plus + #soulseek client + nicotine-plus - #dark web browsing deep web browsing - tor-browser + #dark web browsing deep web browsing + tor-browser - #audio editing - audacity + #audio editing + audacity - #fonts - noto-fonts - noto-fonts-emoji - liberation_ttf - nerdfonts - jetbrains-mono + #fonts + noto-fonts + noto-fonts-emoji + liberation_ttf - #for ebook reading - foliate + #for ebook reading + foliate - #audio mixer (pavucontrol but for pipewire) - pwvucontrol + #audio mixer (pavucontrol but for pipewire) + pwvucontrol - #minecraft launcher - prismlauncher + #minecraft launcher + prismlauncher - mpv - mumble - system76-keyboard-configurator + mpv + mumble + system76-keyboard-configurator - #jellyfin - finamp # music player - delfin # jellyfin client + #jellyfin + finamp # music player + delfin # jellyfin client - signal-desktop + signal-desktop - #accounting - gnucash + #accounting + gnucash - # image tools - inkscape - nomacs + # image tools + inkscape + nomacs - # partitioning utilities - gparted - gnome-disk-utility + # partitioning utilities + gparted + gnome-disk-utility - # small nicities - wl-clipboard # wl-copy & wl-paste - libnotify # notifications library - xdg-utils # xdg utils + # small nicities + wl-clipboard # wl-copy & wl-paste + libnotify # notifications library + xdg-utils # xdg utils - # music tagging utility - picard + # music tagging utility + picard - # music lyric fetcher - lrcget + # music lyric fetcher + lrcget - inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser + inputs.zen-browser.packages."${system}".specific - # freecad-wayland - puddletag + # freecad-wayland + puddletag - epiphany + epiphany - mcaselector - ]; + mcaselector + ] + ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); programs.zed-editor = { enable = true; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 7677b86..85c988e 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -20,21 +20,18 @@ hexyl # rust stuff - (rust-bin.selectLatestNightlyWith ( - toolchain: - toolchain.default.override { - extensions = [ - "rust-src" - "rust-analyzer" - "clippy" - "rustfmt" - "rust-std" - "cargo" - ]; - # thumbv7m-none-eabi target for stm32 - targets = [ "thumbv7m-none-eabi" ]; - } - )) + (rust-bin.stable.latest.default.override ({ + extensions = [ + "rust-src" + "rust-analyzer" + "clippy" + "rustfmt" + "rust-std" + "cargo" + ]; + # thumbv7m-none-eabi target for stm32 + targets = [ "thumbv7m-none-eabi" ]; + })) cargo-expand rust-script diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index a9a8cdf..d3e6a7f 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -15,6 +15,15 @@ let sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } + { + name = "QwQ-32B-Preview-IQ4_XS.gguf"; + context_length = 32768; + gen_length = 8192; + source = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/QwQ-32B-Preview-GGUF/resolve/main/QwQ-32B-Preview-IQ4_XS.gguf?download=true"; + sha256 = "0d4na9hyjmq2jan9svzpnjaq7khm86k049kn7yznfww4387c1gvw"; + }; + } ]; gpt4all_package = (