From fd7985361a75fab02eaef8bc0285cad11c06c243 Mon Sep 17 00:00:00 2001 From: Vegard Bieker Matthey Date: Wed, 4 Feb 2026 01:29:21 +0100 Subject: [PATCH] move .m2 dir --- configuration.nix | 30 ++++++++++++++++++--- flake.lock | 66 +++++++++++++++++++++++++++++++++++------------ flake.nix | 6 ++--- home.nix | 52 +++++++++++++++++++++++++++++++++++-- 4 files changed, 130 insertions(+), 24 deletions(-) diff --git a/configuration.nix b/configuration.nix index a6c6f88..0403c66 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { imports = [ ./hardware-configuration.nix @@ -19,6 +19,10 @@ keyMap = "no"; }; + environment.systemPackages = with pkgs; [ + git + ]; + nix.settings = { pure-eval = true; experimental-features = [ @@ -31,8 +35,22 @@ "arm-linux" ]; trusted-users = [ "vbm" ]; + substituters = [ + "https://cache.nixos.org/" + "https://cuda-maintainers.cachix.org" + "https://nix-community.cachix.org" + "https://nixos-rocm.cachix.org" + "https://nixpkgs-unfree.cachix.org" + ]; + + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + ]; }; + nix.extraOptions = lib.mkDefault "builders-use-substitutes = true"; + services.thermald.enable = true; fonts.fontconfig.enable = true; @@ -66,6 +84,10 @@ XDG_CONFIG_HOME = "$HOME/.config"; XDG_DATA_HOME = "$HOME/.local/share"; XDG_STATE_HOME = "$HOME/.local/state"; + ECLIPSE_HOME = "${XDG_CONFIG_HOME}/eclipse"; + PSQL_HISTORY = "${XDG_STATE_HOME}/psql_history"; + MAVEN_OPTS = "-Dmaven.repo.local=${XDG_DATA_HOME}/maven/repository"; + MAVEN_ARGS = "--settings ${XDG_CONFIG_HOME}/maven/settings.xml"; XDG_BIN_HOME = "$HOME/.local/bin"; PATH = [ @@ -115,6 +137,7 @@ "wheel" "video" "input" + "wireshark" ]; shell = pkgs.nushell; packages = with pkgs; [ @@ -135,8 +158,6 @@ imv unzip zip - zathura - zathuraPkgs.zathura_cb qbittorrent typst calibre @@ -144,6 +165,9 @@ rustfmt wmenu umu-launcher + cachix + grim + slurp ]; }; diff --git a/flake.lock b/flake.lock index 29582f1..40ac3cd 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -42,6 +42,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -49,11 +67,11 @@ ] }, "locked": { - "lastModified": 1768997641, - "narHash": "sha256-7vT8oS6ra/dJaZ6ShvZiPtlZ40XI7CTSb2PmuNPMiXE=", + "lastModified": 1769397130, + "narHash": "sha256-TTM4KV9IHwa181X7afBRbhLJIrgynpDjAXJFMUOWfyU=", "owner": "nix-community", "repo": "home-manager", - "rev": "27b60942b7285824937f8c2c05021370f6fc5904", + "rev": "c37679d37bdbecf11bbe3c5eb238d89ca4f60641", "type": "github" }, "original": { @@ -64,11 +82,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768886240, - "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=", + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", "type": "github" }, "original": { @@ -84,14 +102,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1768910181, - "narHash": "sha256-YRU0IHMzXluZxr0JDfq9jtblb4DV7MIB5wj2jYMFKQc=", + "lastModified": 1769418848, + "narHash": "sha256-jLSg9IkglcIw64kU1utXxsxXhiVdD45dkh9ZJKaFQ7U=", "owner": "nix-community", "repo": "nixvim", - "rev": "5b138edcb2f1c3ed4b29eca3658f04f0639b98b3", + "rev": "c19a0517ddeed4c1548611e42e187048fc2e5dcf", "type": "github" }, "original": { @@ -108,11 +126,11 @@ ] }, "locked": { - "lastModified": 1769006279, - "narHash": "sha256-feAdxXt1PGNYVCCtM+M7sr0LnPj+44g5YkO+QooKKpA=", + "lastModified": 1769425051, + "narHash": "sha256-/p57VO6pwwVqAeNwbei6BLqe9hmPybu6FHIKNNRwhjg=", "owner": "nix-community", "repo": "NUR", - "rev": "4bc56944bef721dc83844bfbec40eaf396e5b474", + "rev": "8c9b80c54ac2d8d302f6b42e91ec8ceb5df5dca7", "type": "github" }, "original": { @@ -123,6 +141,7 @@ }, "root": { "inputs": { + "flake-utils": "flake-utils", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixvim": "nixvim", @@ -143,6 +162,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c5a9232..65a95b7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,7 @@ { description = "L config"; inputs = { - nixpkgs = { - url = "github:nixos/nixpkgs/nixos-unstable"; - }; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -16,6 +14,7 @@ url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; + flake-utils.url = "github:numtide/flake-utils"; }; outputs = inputs: { @@ -33,6 +32,7 @@ inputs.nixvim.homeModules.nixvim ]; } + inputs.nur.modules.nixos.default ]; }; }; diff --git a/home.nix b/home.nix index 84c95f9..1b5a5bf 100644 --- a/home.nix +++ b/home.nix @@ -2,8 +2,15 @@ lib, pkgs, config, + # nur, ... }: +# let +# nur-no-pkgs = import (builtins.fetchTarball { +# url = "https://github.com/nix-community/NUR/archive/main.tar.gz"; +# sha256 = "1v2b4qngg9ga9hi4c6kl55l5qfxkicsc625mr7d6v3b8i565kxjn"; +# }) { }; +# in { home = { username = "vbm"; @@ -11,6 +18,19 @@ stateVersion = "25.11"; }; + # imports = lib.attrValues nur-no-pkgs.repos.moredhel.hmModules.rawModules; + + # services.unison = { + # enable = true; + # profiles = { + # org = { + # src = "/home/moredhel/org"; + # dest = "/home/moredhel/org.backup"; + # extraArgs = "-batch -watch -ui text -repeat 60 -fat"; + # }; + # }; + # }; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ @@ -60,6 +80,7 @@ }; programs.zoxide = { + enable = true; enableNushellIntegration = config.programs.nushell.enable; }; @@ -163,6 +184,13 @@ }; }; + programs.zathura = { + enable = true; + options = { + selection-clipboard = "clipboard"; + }; + }; + programs.nixvim = { enable = true; dependencies.ripgrep.enable = true; @@ -244,6 +272,7 @@ wayland.windowManager.sway = { enable = true; wrapperFeatures.gtk = true; + checkConfig = false; # necessary for wallpaper since the file is not available in sandbox. config = rec { bars = [ { @@ -266,6 +295,7 @@ output = { eDP-1 = { scale = "0"; + bg = "~/Images/Wallpapers/d3.png fill"; }; }; defaultWorkspace = "workspace number 1"; @@ -291,6 +321,18 @@ }; }; + wayland.windowManager.river = { + enable = true; + systemd.enable = true; + settings = { + map = { + normal = { + "Mod4 Return" = "spawn 'foot'"; + }; + }; + }; + }; + programs.foot = { enable = true; settings = { @@ -328,8 +370,13 @@ programs.nushell = { enable = true; + shellAliases = { + # TODO: Use environment variable + mvn = "mvn -gs /home/vbm/.config/maven/settings.xml"; + }; settings = { show_banner = false; + # line_editor.show_hints = false; }; extraConfig = "$env.config.edit_mode = 'vi'"; }; @@ -354,7 +401,8 @@ programs.librewolf = { enable = true; - # package = null; librewolf-unwrapped shenanigans. + # package = pkgs.librewolf-bin; # librewolf-unwrapped shenanigans. + # package = null; profiles.default = { settings = { @@ -369,7 +417,7 @@ "places.history.enabled" = false; "webgl.disabled" = false; }; - # extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ + # extensions.packages = with pkgs.repos.rycee.firefox-addons; [ # darkreader # bypass-paywalls-clean # ];