diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/basic-tools/nix.nix | 14 | ||||
| -rw-r--r-- | modules/desktop-software.nix | 3 | ||||
| -rw-r--r-- | modules/devtools.nix | 12 | ||||
| -rw-r--r-- | modules/fonts.nix | 7 | ||||
| -rw-r--r-- | modules/niri.nix | 7 |
5 files changed, 11 insertions, 32 deletions
diff --git a/modules/basic-tools/nix.nix b/modules/basic-tools/nix.nix index 980ab76..a67c6a8 100644 --- a/modules/basic-tools/nix.nix +++ b/modules/basic-tools/nix.nix @@ -1,7 +1,5 @@ { - lib, pkgs, - inputs, ... }: { @@ -16,14 +14,10 @@ # nix output-monitor environment.systemPackages = [ pkgs.nix-output-monitor ]; - # override default nix shell nixpkgs# behaviour to use current flake lock - nix.registry = - let - flakes = lib.filterAttrs (_name: value: value ? outputs) inputs.self.inputs; - in - builtins.mapAttrs (_name: v: { flake = v; }) flakes; - - nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value.outPath}") inputs.self.inputs; + nixpkgs.flake = { + setFlakeRegistry = true; + setNixPath = true; + }; nixpkgs.config.allowUnfree = true; } diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 54dcab0..56ee450 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -17,8 +17,9 @@ element-desktop discord mpv - dwarf-fortress-packages.dwarf-fortress-full + # dwarf-fortress-packages.dwarf-fortress-full obs-studio + firefox-wayland ]; programs.steam.enable = true; } diff --git a/modules/devtools.nix b/modules/devtools.nix index 8288862..a003e6e 100644 --- a/modules/devtools.nix +++ b/modules/devtools.nix @@ -1,8 +1,5 @@ { pkgs, - inputs, - config, - lib, ... }: { @@ -16,11 +13,6 @@ kikit-library ]; }; - - # binwalk v3 on 24.11 - sys_ver = config.system.nixos.release; - unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; - binwalkv3 = if lib.versionOlder "25.05" sys_ver then binwalk else unstablepkgs.binwalk; in [ # general @@ -29,7 +21,7 @@ gef gdb binutils - binwalkv3 + binwalk clang clang-tools direnv @@ -41,7 +33,7 @@ kikit freecad-wayland imhex - python313Full + python3Full nixfmt-rfc-style treefmt android-tools diff --git a/modules/fonts.nix b/modules/fonts.nix index a3516e9..feaee83 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -27,12 +27,7 @@ twitter-color-emoji iosevka-bin cozette - (nerdfonts.override { - fonts = [ - "Hack" - "3270" - ]; - }) + nerd-fonts.hack ]; fonts.enableDefaultPackages = true; diff --git a/modules/niri.nix b/modules/niri.nix index 1a8b59d..0a0afa8 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -1,8 +1,5 @@ # General Desktop-related config { pkgs, inputs, ... }: -let - unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; -in { nixpkgs.overlays = [ inputs.niri.overlays.niri ]; @@ -35,7 +32,7 @@ in bluetui gammastep graphicsmagick - unstablepkgs.i3status-rust + i3status-rust impala kanshi pamixer @@ -46,7 +43,7 @@ in banana-cursor fuzzel alacritty - unstablepkgs.i3bar-river + i3bar-river mako swww oculante |