diff --git a/flake.nix b/flake.nix index bd6568a..d9bfbe4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Main nixos system configuration management by Jonas Hahn"; inputs = { - nixpkgs.url = "nixpkgs/nixos-25.05"; + nixpkgs.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; sops-nix = { @@ -11,7 +11,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/hosts/minoxy-workstation/hardware-configuration.nix b/hosts/minoxy-workstation/hardware-configuration.nix index 91f8ba4..b95b80b 100644 --- a/hosts/minoxy-workstation/hardware-configuration.nix +++ b/hosts/minoxy-workstation/hardware-configuration.nix @@ -13,9 +13,9 @@ boot.extraModulePackages = [ ]; fileSystems."/shared" = { - device = "/dev/disk/by-uuid/8CEA-13E3"; # use lsblk -f - fsType = "exfat"; - options = [ "defaults" "uid=1000" "gid=100" "umask=000" ]; + device = "/dev/disk/by-uuid/554a844e-e1de-4c4d-bba6-0102e49751cd"; # use lsblk -f + fsType = "ext4"; + #options = [ "uid=1000" "gid=100" "umask=000" ]; }; # FUll btrfs config diff --git a/hosts/thinix-thinkpad/configuration.nix b/hosts/thinix-thinkpad/configuration.nix index b4dff6d..e596a0d 100644 --- a/hosts/thinix-thinkpad/configuration.nix +++ b/hosts/thinix-thinkpad/configuration.nix @@ -27,10 +27,9 @@ size = 4096; }]; - services.xserver.xkb = { - layout = "de"; # or "us" or whatever base - }; - console.useXkbConfig = true; # to make it apply on TTY too - + services.udev.extraRules = '' + # Ignore internal NVMe Windows partition + KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" + ''; system.stateVersion = "24.11"; # Dont change this } diff --git a/modules/essential.nix b/modules/essential.nix index 1732b3c..e6e2f54 100644 --- a/modules/essential.nix +++ b/modules/essential.nix @@ -58,10 +58,10 @@ networking = { networkmanager = { enable = true; }; }; i18n.defaultLocale = "en_US.UTF-8"; - #console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - #}; + console = { + font = "Lat2-Terminus16"; + keyMap = "us"; + }; programs.zsh = { enable = true; diff --git a/modules/graphics/workstation.nix b/modules/graphics/workstation.nix index 5e3e1e8..464ed7c 100644 --- a/modules/graphics/workstation.nix +++ b/modules/graphics/workstation.nix @@ -17,6 +17,7 @@ programs = { hyprland.enable = true; + niri.enable = true; firefox.enable = true; }; } diff --git a/user/packages.nix b/user/packages.nix index df17868..60bdde2 100644 --- a/user/packages.nix +++ b/user/packages.nix @@ -23,6 +23,7 @@ qbittorrent ausweisapp nextcloud-client + owncloud-client spotify # --- Media & Desktop Tools --- @@ -67,6 +68,12 @@ bat vim unstable.neovim + unstable.zellij + unstable.helix + unstable.jujutsu + jjui + uv + nap emacs inotify-tools stow