diff --git a/flake.lock b/flake.lock index 078eee3..4f74b05 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1722273087, - "narHash": "sha256-uELMts/UTJ4jTPQbQgOnE75flmdbWm672yDvL3QLWOI=", + "lastModified": 1728148288, + "narHash": "sha256-YYmMKw6Gk0fVAjvAxWQNjecear2JfZkrXnKKBTH8YNI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "087cf45264b4487b2848e08548bb4c5f933d460c", + "rev": "125316ab852d4d9abd771be51471b52ead9aa0c8", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1722321190, - "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1728067476, + "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", "type": "github" }, "original": { diff --git a/home/alex/default.nix b/home/alex/default.nix index d3db935..8e99ff4 100644 --- a/home/alex/default.nix +++ b/home/alex/default.nix @@ -1,11 +1,24 @@ -{ config, lib, pkgs, inputs, ... }: -let electron-overlay = final: prev: { electron = final.electron_25; }; -in { +{ + config, + lib, + pkgs, + inputs, + ... +}: +let + electron-overlay = final: prev: { electron = final.electron_25; }; +in +{ imports = [ ]; users.users."alex" = { isNormalUser = true; - extraGroups = [ "input" "networkmanager" "wheel" ]; + extraGroups = [ + "input" + "networkmanager" + "wheel" + "video" + ]; description = "Alexander Kobjolke"; home = "/home/alex"; shell = pkgs.zsh; diff --git a/home/alex/programs/shell/default.nix b/home/alex/programs/shell/default.nix index d5db9b4..3866337 100644 --- a/home/alex/programs/shell/default.nix +++ b/home/alex/programs/shell/default.nix @@ -1,10 +1,15 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { home.shellAliases = { suspend = "systemctl hibernate"; - nrs = "sudo nixos-rebuild switch --flake ."; - nrb = "sudo nixos-rebuild build --flake ."; + nrs = "sudo nixos-rebuild switch --flake ~/src/nixos-config"; + nrb = "sudo nixos-rebuild build --flake ~/src/nixos-config"; }; programs.zsh = { @@ -12,7 +17,11 @@ autosuggestion.enable = true; oh-my-zsh = { enable = true; - plugins = [ "git" "fzf" "fd" "z" ]; + plugins = [ + "git" + "fzf" + "z" + ]; theme = "simple"; }; }; diff --git a/home/alex/services/dunst/default.nix b/home/alex/services/dunst/default.nix index 4dacb5b..70d796a 100644 --- a/home/alex/services/dunst/default.nix +++ b/home/alex/services/dunst/default.nix @@ -1,11 +1,16 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { config.services.dunst = { enable = true; iconTheme = { name = "Adwaita"; - package = pkgs.gnome3.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; size = "16x16"; }; settings = { diff --git a/home/anne/home.nix b/home/anne/home.nix index 59a3f37..abd5ee4 100644 --- a/home/anne/home.nix +++ b/home/anne/home.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { home = { @@ -7,8 +12,8 @@ packages = with pkgs; [ firefox alacritty - gnome.gnome-session - gnome.gnome-control-center + gnome-session + gnome-control-center ]; keyboard.layout = "de"; keyboard.variant = "nodeadkeys"; @@ -16,6 +21,6 @@ xsession = { enable = true; - windowManager.command = "${pkgs.gnome.gnome-session}/bin/gnome-session"; + windowManager.command = "${pkgs.gnome-session}/bin/gnome-session"; }; } diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index 4a61670..76f1a29 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -2,7 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ inputs, config, pkgs, lib, ... }: +{ + inputs, + config, + pkgs, + lib, + ... +}: let nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" '' export __NV_PRIME_RENDER_OFFLOAD=1 @@ -11,7 +17,8 @@ let export __VK_LAYER_NV_optimus=NVIDIA_only exec "$@" ''; -in { +in +{ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -33,17 +40,21 @@ in { networking.hostName = "dregil"; # Define your hostname. # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = - true; # Easiest to use and most distros use this by default. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.extraHosts = '' 127.0.0.1 localhost dregil.localdomain dregil ''; i18n = { - extraLocaleSettings = { TIME_STYLE = "iso"; }; - supportedLocales = - [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "de_DE.UTF-8/UTF-8" ]; + extraLocaleSettings = { + TIME_STYLE = "iso"; + }; + supportedLocales = [ + "C.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" + "de_DE.UTF-8/UTF-8" + ]; }; console = { @@ -66,9 +77,8 @@ in { # Enable CUPS to print documents. # services.printing.enable = true; - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; + # Enable sound using pipewire + hardware.pulseaudio.enable = false; # List packages installed in system profile. To search, run: # $ nix search wget @@ -87,11 +97,17 @@ in { nix.settings.max-jobs = 3; nix.settings.cores = 4; - programs.neovim = { enable = true; }; + programs.neovim = { + enable = true; + }; - programs.steam = { enable = true; }; + programs.steam = { + enable = true; + }; - programs.zsh = { enable = true; }; + programs.zsh = { + enable = true; + }; # List services that you want to enable: @@ -100,10 +116,19 @@ in { services.blueman.enable = true; + services.pipewire.enable = true; + services.pipewire.pulse.enable = true; + # Open ports in the firewall # 22000, 21027 syncthing discovery and connectivity - networking.firewall.allowedTCPPorts = [ 5223 22000 ]; - networking.firewall.allowedUDPPorts = [ 21027 22000 ]; + networking.firewall.allowedTCPPorts = [ + 5223 + 22000 + ]; + networking.firewall.allowedUDPPorts = [ + 21027 + 22000 + ]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/hosts/dregil/hardware-configuration.nix b/hosts/dregil/hardware-configuration.nix index 32acf7f..6f9e45d 100644 --- a/hosts/dregil/hardware-configuration.nix +++ b/hosts/dregil/hardware-configuration.nix @@ -95,6 +95,7 @@ hardware.nvidia = { nvidiaSettings = true; nvidiaPersistenced = true; + open = true; # modesetting.enable = true; package = config.boot.kernelPackages.nvidiaPackages.beta;