From 58ada4c0cdee9180e4546dcf1acce9e69c8408a5 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 25 Oct 2024 12:10:16 +0200 Subject: [PATCH] 232 current 2024-10-25 12:10:10 24.05.20241019.a9b86fc 6.11.4 * --- hosts/crocoite/crocoite.nix | 26 ++++++- modules/sec_auth/login-manager.nix | 2 +- modules/software/software.nix | 109 +++++++++++++---------------- modules/wm_and_de/hyprland.nix | 6 +- 4 files changed, 75 insertions(+), 68 deletions(-) diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index d2c40c4..9b8237c 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -1,6 +1,5 @@ { pkgs, - overlays, inputs, ... }: { @@ -16,9 +15,32 @@ # Allow unfree packages #unstable.config.allowUnfree = true; - nixpkgs.config.allowUnfree = true; #nixpkgs.overlays = [ overlays.unstable-packages ]; + nixpkgs = { + # You can add overlays here + overlays = with inputs.self.overlays; [ + # Add overlays your own flake exports (from overlays and pkgs dir): + #additions + #modifications + unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; nix.settings.experimental-features = ["nix-command" "flakes"]; diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix index 9019b0e..6f77277 100644 --- a/modules/sec_auth/login-manager.nix +++ b/modules/sec_auth/login-manager.nix @@ -12,7 +12,7 @@ --remember \ --user-menu \ --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ - --cmd hyprland''; + --cmd Hyprland''; # removed elements from theme: container user = "greeter"; }; diff --git a/modules/software/software.nix b/modules/software/software.nix index 7daee2c..69784fa 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -1,12 +1,4 @@ -{ - pkgs, - inputs, - ... -}: let - unstable_list = with inputs.nixpkgs-unstable.legacyPackages."x86_64-linux"; [ - neovim - ]; -in { +{pkgs, ...}: { # also opens the TCP and UDP port from 1714 to 1764 programs.kdeconnect.enable = true; @@ -20,61 +12,58 @@ in { exec "${pkgs.amberol}/bin/amberol" "$@" ''; in - with pkgs; - [ - # low level stuff - efibootmgr - #exfat - exfatprogs - greetd.greetd - greetd.tuigreet - killall - vulnix + with pkgs; [ + # low level stuff + efibootmgr + #exfat + exfatprogs + greetd.greetd + greetd.tuigreet + killall + vulnix - # hardware - brightnessctl - usbutils - lm_sensors + # hardware + brightnessctl + usbutils + lm_sensors - # neovim - # unstable.neovim - git - gnumake - gcc - nodePackages.npm - nodejs-slim - python3 - fd - nodejs-slim - cargo - rustc + unstable.neovim + git + gnumake + gcc + nodePackages.npm + nodejs-slim + python3 + fd + nodejs-slim + cargo + rustc - # tooling - htop - ncdu - wget - miniserve - file - unzip - tmux - ripgrep - qemu - home-manager + # tooling + htop + ncdu + wget + miniserve + file + unzip + tmux + ripgrep + qemu + home-manager - # move to homemanager? - mumble - amberol_wrapper - amberol - nuclear - mpv - zathura - feh - #unstable.obsidian - keepassxc - #minecraft - element-desktop - ] - ++ unstable_list; + # move to homemanager? + mumble + amberol_wrapper + amberol + nuclear + mpv + zathura + feh + #unstable.obsidian + keepassxc + #minecraft + element-desktop + ]; fonts.packages = with pkgs; [ noto-fonts diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index 6d8310b..3aaac03 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -1,8 +1,4 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = false;