diff options
| author | adikro <adikro@disroot.org> | 2026-01-23 22:38:49 +0100 |
|---|---|---|
| committer | adikro <adikro@disroot.org> | 2026-01-23 22:38:49 +0100 |
| commit | b0bd96459ff81aaf1a4e768b1a6222cdd86026f9 (patch) | |
| tree | 33abd880bf70b9e2a403380fbce220da98e44495 | |
| parent | d2571482b4eb5660fd92727efb4e5254df06e45e (diff) | |
too much to remember
| -rw-r--r-- | flake.lock | 66 | ||||
| -rw-r--r-- | hm/shell/foot.nix | 20 | ||||
| -rw-r--r-- | hm/soft/browser.nix | 111 | ||||
| -rw-r--r-- | hm/soft/nixcord.nix | 8 | ||||
| -rw-r--r-- | hosts/desktop/configuration.nix | 19 | ||||
| -rw-r--r-- | hosts/thinkpad/configuration.nix | 1 | ||||
| -rw-r--r-- | os/core/storage.nix | 23 | ||||
| -rw-r--r-- | os/srv/files.nix | 15 | ||||
| -rw-r--r-- | os/srv/gaming.nix | 3 | ||||
| -rw-r--r-- | os/srv/kdeconnect.nix | 2 | ||||
| -rw-r--r-- | os/srv/monero.nix | 55 | ||||
| -rw-r--r-- | os/srv/srv.nix | 4 | ||||
| -rw-r--r-- | os/srv/virtualization.nix (renamed from os/srv/kvm.nix) | 14 | ||||
| -rw-r--r-- | os/srv/zzz.nix | 19 | ||||
| -rw-r--r-- | os/wm/niri.nix | 2 |
15 files changed, 248 insertions, 114 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746728054, - "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=", + "lastModified": 1768920986, + "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=", "owner": "nix-community", "repo": "disko", - "rev": "ff442f5d1425feb86344c028298548024f21256d", + "rev": "de5708739256238fb912c62f03988815db89ec9a", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1768798936, - "narHash": "sha256-eHld4id3TeD9Sxx5vgv58BnTl1fz+ewIKspz/kEoAE8=", + "lastModified": 1769187349, + "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2954aa29441a1a98901362e4d35515875761ad65", + "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1768781101, - "narHash": "sha256-p3guh/Vx4Pf+Ggk3X69SPTJot6emv6rgKpoBLNO61Ag=", + "lastModified": 1769126721, + "narHash": "sha256-vMWf9C4LK2fshCKgUYGR0fn4/3qg2/sWyFILv4YYTB8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e90cb6d441572fc05ffb8769051d59f1d2d3269e", + "rev": "7c77dcce004c0845da25e0fe9a6c8b11bd46e614", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1768778690, - "narHash": "sha256-XrWZBeH0GnvnQzE9Xmm69sesSGB2h5uVLuTmLA7k1p0=", + "lastModified": 1769125444, + "narHash": "sha256-KOVSBncEUsn5ZqbkaDo5GhXWCoKqdZGij/KnLH5CoVI=", "owner": "neovim", "repo": "neovim", - "rev": "30259d6af79e731491e6b12d815893b1b130b52b", + "rev": "c39d18ee939cba5f905416fcc97661b1836f4de4", "type": "github" }, "original": { @@ -216,11 +216,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768767453, - "narHash": "sha256-Omq1UHEJ1oxkTo2j8l6qQtmyPR7Uj+k7HC5Khd3jVVA=", + "lastModified": 1769170609, + "narHash": "sha256-LiyaKNga2z/iG4pNr86iQLySEDoOytEzTCblxzRjnCk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8eab7c21ef4edc97cc56ddb8e76a842e0818d6d7", + "rev": "08d6e6adf34b0af12be7eaeacc0b4c1a8580b3da", "type": "github" }, "original": { @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1768610265, - "narHash": "sha256-JZgnO/gPPBgFCKsQHIT2mRcK0vkwWGfyg/6wOJkb+F8=", + "lastModified": 1769187435, + "narHash": "sha256-kxMx16F9hS7xUozxJouEUXZeSjRcLgBL9V5a4it4cos=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "02c730b57b8ef16c62624a3410ef724d014c58db", + "rev": "af7f4d4b54a397f574fe950000862ae8c4cdb9ea", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1768621446, - "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", + "lastModified": 1769089682, + "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", + "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1768795384, - "narHash": "sha256-gZIXLzhupxAwRMMRTFgrl669ciYiiPmnA3PwocJ+6jQ=", + "lastModified": 1768910181, + "narHash": "sha256-YRU0IHMzXluZxr0JDfq9jtblb4DV7MIB5wj2jYMFKQc=", "owner": "nix-community", "repo": "nixvim", - "rev": "57d393deb53af1b28b14973d3e3885c3d17e7bbe", + "rev": "5b138edcb2f1c3ed4b29eca3658f04f0639b98b3", "type": "github" }, "original": { @@ -411,11 +411,11 @@ ] }, "locked": { - "lastModified": 1763952169, - "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=", + "lastModified": 1769091129, + "narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab726555a9a72e6dc80649809147823a813fa95b", + "rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596", "type": "github" }, "original": { @@ -574,11 +574,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1768756095, - "narHash": "sha256-5YO/8LTVhUFJ4jJMuJtgE3oGGD0D7aR0fcfHEKvQmTo=", + "lastModified": 1769174081, + "narHash": "sha256-XlvB9gRDLMKpQDiNAqGs9x/uOHRtq65lZuxlPbhRTN8=", "owner": "sxyazi", "repo": "yazi", - "rev": "ca4cc594136e313b47f8da0f3699b7ea9699a959", + "rev": "49b8324bbfc548f4190e3362e304480948539fdb", "type": "github" }, "original": { diff --git a/hm/shell/foot.nix b/hm/shell/foot.nix index c840b5e..3143d12 100644 --- a/hm/shell/foot.nix +++ b/hm/shell/foot.nix @@ -1,13 +1,20 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: let cfg = config.hm.shell.foot; - + footTheme = pkgs.runCommand "gruvbox-dark" { } '' - sed 's/\[colors-dark\]/\[colors\]/g' ${pkgs.fetchurl { - url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark"; - sha256 = "sha256-hlmLklG/vAEDy8I+k13+o4ZR6Cq6lTxOconjf9M75eo="; - }} > $out + sed 's/\[colors-dark\]/\[colors\]/g' ${ + pkgs.fetchurl { + url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark"; + sha256 = "sha256-hlmLklG/vAEDy8I+k13+o4ZR6Cq6lTxOconjf9M75eo="; + } + } > $out ''; in { @@ -23,6 +30,7 @@ in config = lib.mkIf cfg.enable { programs.foot = { enable = true; + server.enable = true; settings = { main = { font = "JetBrainsMonoNFM-Regular:size=${toString cfg.fontSize}"; diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix index e46e482..dfbf92d 100644 --- a/hm/soft/browser.nix +++ b/hm/soft/browser.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.hm.soft.browser; in @@ -13,23 +18,113 @@ in enable = true; profiles = { main = { + isDefault = true; name = "main"; - # bookmarks.configFile = ./bookmarks; - extensions = { - + extensions = { }; + bookmarks = { + force = true; + settings = [ + { + name = "Toolbar Root"; + toolbar = true; + bookmarks = [ + { + name = "Youtube"; + tags = [ "yt" ]; + keyword = "yt"; + url = "https://www.youtube.com"; + } + ]; + } + ]; }; search = { - - }; - settings = { - + force = true; + default = "SearXNG"; + privateDefault = "SearXNG"; + engines = { + "SearXNG" = { + urls = [ { template = "https://searx.tiekoetter.com/search?q={searchTerms}"; } ]; + icon = "https://searx.tiekoetter.com/favicon.ico"; + definedAliases = [ "@s" ]; + }; + "Nixos Packages" = { + urls = [ + { + template = "https://search.nixos.org/packages"; + params = [ + { + name = "channel"; + value = "unstable"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + } + ]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@nix" ]; + }; + "HM Options" = { + urls = [ + { + template = "https://home-manager-options.extranix.com"; + params = [ + { + name = "query"; + value = "{searchTerms}"; + } + { + name = "release"; + value = "master"; + } + ]; + } + ]; + }; + "google".metaData.hidden = true; + "amazondotcom-us".metaData.hidden = true; + "bing".metaData.hidden = true; + "ebay".metaData.hidden = true; + "duckduckgo".metaData.hidden = true; + "wikipedia".metaData.hidden = true; + "perplexity".metaData.hidden = true; + }; }; + settings = { }; }; }; settings = { "ui.key.menuAccessKeyFocuses" = false; + "browser.search.update" = false; + "browser.formfill.enable" = false; + "browser.search.suggest.enabled" = false; + "signon.rememberSignons" = false; + + "browser.urlbar.suggest.history" = false; + "browser.urlbar.suggest.bookmark" = false; + "browser.urlbar.suggest.openpage" = false; + "browser.urlbar.suggest.engines" = false; + "browser.urlbar.suggest.topsites" = false; + "browser.urlbar.showSearchTerms.featureGate" = false; + + "browser.toolbars.bookmarks.visibility" = "always"; + + "privacy.clearOnShutdown.cookies" = true; + "privacy.clearOnShutdown.cache" = true; + + "network.cookie.lifetimePolicy" = 0; + "privacy.cpd.cookies" = true; + + # "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; + # "layout.css.prefers-color-scheme.content-override" = 0; + # "browser.theme.content-theme" = 0; + # "browser.theme.toolbar-theme" = 0; }; }; + home.packages = [ pkgs.nixos-icons ]; }) (lib.mkIf cfg.brave.enable { diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix index 1b9a9e8..a32a0b0 100644 --- a/hm/soft/nixcord.nix +++ b/hm/soft/nixcord.nix @@ -121,10 +121,10 @@ in square = true; }; inviteDefaults.enable = true; - limitMiddleClickPaste = { - enable = true; - limitTo = "never"; - }; + # limitMiddleClickPaste = { + # enable = true; + # limitTo = "never"; + # }; memberCount.enable = true; mentionAvatars = { enable = true; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index c43d4de..210ac08 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -50,15 +50,13 @@ network.enable = true; security.enable = true; ssh.enable = true; - storage = { - enable = true; - cleanDates = "monthly"; - }; + storage.enable = true; users.enable = true; }; srv = { files = { thunar.enable = true; + krusader.enable = true; utils.enable = true; }; gaming = { @@ -66,12 +64,14 @@ steam.enable = true; vr.enable = true; }; - kvm.enable = true; + virtualization.enable = true; nix-helper.enable = true; ollama.enable = true; - # bluetooth.enable = true; kdeconnect.enable = true; - # zzz.enable = true; + monero = { + enable = true; + # mining.enable = true; + }; }; wm = { enable = true; @@ -79,10 +79,7 @@ }; }; - environment.systemPackages = with pkgs; [ - krusader - kdePackages.kio-extras - ]; + programs.nix-ld.enable = true; xdg.terminal-exec = { enable = true; diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix index f97d714..08c3631 100644 --- a/hosts/thinkpad/configuration.nix +++ b/hosts/thinkpad/configuration.nix @@ -47,7 +47,6 @@ thunar.enable = true; utils.enable = true; }; - # kvm.enable = true; kdeconnect.enable = true; nix-helper.enable = true; }; diff --git a/os/core/storage.nix b/os/core/storage.nix index fde9399..59f0093 100644 --- a/os/core/storage.nix +++ b/os/core/storage.nix @@ -5,32 +5,15 @@ in { options.os.core.storage = { enable = lib.mkEnableOption "enables storage management"; - - cleanDates = lib.mkOption { - type = lib.types.str; - default = "weekly"; - description = "how often to clean the system of old generations"; - }; }; config = lib.mkIf cfg.enable { nix.settings.auto-optimise-store = true; - - programs.nh = { - enable = true; - clean = { - enable = true; - dates = "${toString cfg.cleanDates}"; - extraArgs = "--keep 5"; - }; - }; - + programs.nh.enable = true; services.fstrim.enable = true; - services.btrfs.autoScrub = { - enable = true; - fileSystems = [ "/" ]; + enable = true; + fileSystems = [ "/" ]; }; - boot.tmp = { useTmpfs = true; tmpfsSize = "50%"; diff --git a/os/srv/files.nix b/os/srv/files.nix index 2e8faff..b4130b0 100644 --- a/os/srv/files.nix +++ b/os/srv/files.nix @@ -1,10 +1,16 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.os.srv.files; in { options.os.srv.files = { thunar.enable = lib.mkEnableOption "enables the thunar file manager"; + krusader.enable = lib.mkEnableOption "enables krusader for easier file moving using ssh"; utils.enable = lib.mkEnableOption "enables compression and trash utilities"; }; config = lib.mkMerge [ @@ -27,6 +33,13 @@ in environment.systemPackages = with pkgs; [ file-roller ]; }) + (lib.mkIf cfg.krusader.enable { + environment.systemPackages = with pkgs; [ + krusader + kdePackages.kio-extras + ]; + }) + (lib.mkIf cfg.utils.enable { services.gvfs.enable = true; diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix index 9ae0efe..9ac8c88 100644 --- a/os/srv/gaming.nix +++ b/os/srv/gaming.nix @@ -27,10 +27,9 @@ in }; environment.systemPackages = with pkgs; [ + protonplus openmw - protonup-rs heroic - clinfo (prismlauncher.override { additionalLibs = with pkgs; [ ocl-icd diff --git a/os/srv/kdeconnect.nix b/os/srv/kdeconnect.nix index 85bb23e..6bf125c 100644 --- a/os/srv/kdeconnect.nix +++ b/os/srv/kdeconnect.nix @@ -13,7 +13,7 @@ in programs.kdeconnect.enable = true; home-manager.users.${username}.services.kdeconnect = { enable = true; - indicator = true; + # indicator = true; }; }; } diff --git a/os/srv/monero.nix b/os/srv/monero.nix new file mode 100644 index 0000000..e09bc50 --- /dev/null +++ b/os/srv/monero.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.os.srv.monero; + address = "82cAm7hTDr5EPjf9um4zQdYBhH4cxSRFZfzgN9St3jNt1N8ia2Qi6Yj4J5Bwe5aKNBM1fwsrRFkCZUqfHuiAHy11Qy7Z8aF"; +in +{ + options.os.srv.monero = { + enable = lib.mkEnableOption "enables the daemon and wallet"; + mining.enable = lib.mkEnableOption "enables mining monero"; + }; + + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + services.monero = { + enable = true; + prune = true; + dataDir = "/home/monero"; + }; + environment.systemPackages = [ pkgs.monero-cli ]; + }) + (lib.mkIf cfg.mining.enable { + services.xmrig = { + enable = true; + settings = { + autosave = true; + cpu = true; + opencl = true; + pools = [ + { + url = "pool.supportxmr.com:443"; + user = "${address}"; + keepalive = true; + tls = true; + } + { + url = "xmr-eu1.nanopool.org:10343"; + user = "${address}"; + keepalive = true; + tls = true; + } + ]; + }; + }; + boot = { + kernel.sysctl."vm.nr_hugepages" = lib.mkDefault 1280; + initrd.kernelModules = [ "msr" ]; + }; + }) + ]; +} diff --git a/os/srv/srv.nix b/os/srv/srv.nix index d4b3eef..6109361 100644 --- a/os/srv/srv.nix +++ b/os/srv/srv.nix @@ -6,10 +6,10 @@ ./docker.nix ./files.nix ./gaming.nix - ./kvm.nix + ./virtualization.nix ./nix-helper.nix ./ollama.nix ./kdeconnect.nix - ./zzz.nix + ./monero.nix ]; } diff --git a/os/srv/kvm.nix b/os/srv/virtualization.nix index 93a1eed..f32737b 100644 --- a/os/srv/kvm.nix +++ b/os/srv/virtualization.nix @@ -1,18 +1,22 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - cfg = config.os.srv.kvm; + cfg = config.os.srv.virtualization; in { - options.os.srv.kvm.enable = lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager"; + options.os.srv.virtualization.enable = + lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager"; config = lib.mkIf cfg.enable { virtualisation.libvirtd = { enable = true; qemu.package = pkgs.qemu_kvm; qemu.swtpm.enable = true; }; - systemd.services.libvirt-guests.enable = false; - programs.virt-manager.enable = true; boot.initrd.kernelModules = lib.optional (config.os.core.drivers.amd.enable or false) "kvm-amd"; diff --git a/os/srv/zzz.nix b/os/srv/zzz.nix deleted file mode 100644 index cd9a67e..0000000 --- a/os/srv/zzz.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.os.srv.zzz; -in -{ - options.os.srv.zzz.enable = lib.mkEnableOption "enables the zzz rpc service"; - config = lib.mkIf cfg.enable { - systemd.user.services.zzz-presence = { - description = "Zenless Zone Zero Discord Rich Presence"; - wantedBy = [ "default.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.python3.withPackages (ps: [ ps.pypresence ])}/bin/python3 /etc/nixos/resources/zzz.py"; - Restart = "always"; - RestartSec = "10"; - }; - }; - }; -} diff --git a/os/wm/niri.nix b/os/wm/niri.nix index 58d27af..587f543 100644 --- a/os/wm/niri.nix +++ b/os/wm/niri.nix @@ -19,7 +19,7 @@ in programs.niri = { enable = true; - package = pkgs.niri-unstable; + # package = pkgs.niri-unstable; }; os.srv.compat.enable = true; |
