desktop-2024-08-30-13-22-30

configs/browser.nix

@@ -1,9 +1,6 @@
 { config, pkgs, lib, ... }:
-let
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in
 {
-  environment.systemPackages = with unstable.pkgs; [
+  environment.systemPackages = with pkgs.unstable; [
     brave
     chromium
     firefox

configs/common.nix

@@ -1,7 +1,4 @@
 { config, pkgs, lib, ... }:
-let
-  unstable = import <nixos-unstable> {};
-in
 {
   environment.shells = with pkgs; [ bashInteractive zsh ];
 
@@ -61,7 +58,7 @@ in
     networkmanager.dns = "none";
   };
 
-  environment.systemPackages = with unstable.pkgs; [
+  environment.systemPackages = with pkgs.unstable; [
     ack
     borgbackup
     borgmatic

configs/games.nix

@@ -1,10 +1,4 @@
-{ config, pkgs, lib, ... }:
-let
-  unstable = import <nixos-unstable> {
-    config.allowUnfree = true;
-  };
-  nix-gaming = import (builtins.fetchTarball "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
-in
+{ config, pkgs, lib, outputs, ... }:
 {
   programs = {
     gamescope = {
@@ -13,22 +7,23 @@ in
     };
     steam = {
       enable = true;
-      package = unstable.pkgs.steam.override {
-        extraPkgs = pkgs: with unstable.pkgs; [
-          gamescope
-          mangohud
-          libkrb5
-          keyutils
+      package = pkgs.unstable.steam.override {
+        extraPkgs = pkgs: [
+          pkgs.gamescope
+          pkgs.mangohud
+          # libkrb5
+          # keyutils
         ];
       };
     };
   };
 
-  environment.systemPackages = with unstable.pkgs; [
+  environment.systemPackages = with pkgs.unstable; [
     (lutris.override {
-      extraPkgs = pkgs: with unstable.pkgs; [
-        gamescope mangohud
-        ];
+      extraPkgs = pkgs: [
+        pkgs.gamescope
+        pkgs.mangohud
+      ];
     })
 
     heroic

configs/libvirt.nix

@@ -1,7 +1,4 @@
-{ config, pkgs, lib, ... }:
-# let
-#   unstable = import <nixos-unstable> { config.allowUnfree = true; };
-# in
+{ pkgs, ... }:
 {
   virtualisation = {
     libvirtd = {

configs/user-gui.nix

@@ -1,7 +1,6 @@
-{ config, pkgs, lib, ... }:
-let unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in {
-  imports = [ <home-manager/nixos> ];
+{ config, pkgs, inputs, home-manager, ... }:
+{
+  imports = [ inputs.home-manager.nixosModules.home-manager ];
   networking = {
     firewall.enable = false;
     networkmanager = { enable = true; };
@@ -62,7 +61,7 @@ in {
     # };
   };
 
-  environment.systemPackages = with unstable.pkgs; [
+  environment.systemPackages = with pkgs.unstable; [
     alacritty
     czkawka # fslint before
     grsync
@@ -83,7 +82,7 @@ in {
     programs = {
       vscode = {
         enable = true;
-        package = unstable.pkgs.vscode;
+        package = pkgs.unstable.vscode;
       };
 
       mpv = {
@@ -97,7 +96,7 @@ in {
 
       kitty = {
         enable = true;
-        package = unstable.pkgs.kitty;
+        package = pkgs.unstable.kitty;
         extraConfig = ''
           enable_audio_bell false
 

configs/user.nix

@@ -1,9 +1,15 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 let
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
   secrets = import ./secrets.nix;
-in {
-  imports = [ <home-manager/nixos> ];
+in
+{
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+    }
+  ];
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users = {
@@ -41,15 +47,12 @@ in {
     nix-ld.enable = true;
   };
 
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
-
   environment.pathsToLink = [ "/share/zsh" ];
 
   home-manager.users.alex = { pkgs, ... }: {
     home = {
       stateVersion = "24.05";
-      packages = with unstable.pkgs; [
+      packages = with pkgs.unstable; [
         # atop
         broot
         ffmpeg
@@ -141,7 +144,7 @@ in {
         plugins = [
           {
             name = "powerlevel10k";
-            src = unstable.pkgs.zsh-powerlevel10k;
+            src = pkgs.unstable.zsh-powerlevel10k;
             file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
           }
           {
@@ -159,10 +162,6 @@ in {
           "-g C" = "| wc -l";
           "-g G" = "| grep --ignore-case";
           bat = "upower -i /org/freedesktop/UPower/devices/battery_BAT0";
-          brightness-max =
-            "echo 4794 | sudo tee /sys/class/backlight/intel_backlight/brightness";
-          brightness-power-save =
-            "echo 2300 | sudo tee /sys/class/backlight/intel_backlight/brightness";
           ff = "find . -type f -iname";
           l = "eza --group-directories-first -l -g";
           ll = "eza --group-directories-first -l -g";