From 29c4aa84a0c20af87cc9f488b724d80f5ed08280 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 30 May 2026 19:52:02 -0700 Subject: [PATCH] update --- flake.lock | 32 +++++++++++++-------------- home-manager/luke.nix | 5 +++++ home-manager/programs/niri/config.kdl | 5 +++-- nixos/configuration.nix | 24 ++++++++++++++++---- nixos/hardware-configuration.nix | 7 ++++++ 5 files changed, 51 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 7f1d1a0..9540e96 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1778905220, - "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", + "lastModified": 1779506708, + "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", + "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778737229, - "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-VdRy3A14M5vIE882DJcaaR+5wrss9Qsg4YNVbr7uj3k=", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "lastModified": 1779508470, + "narHash": "sha256-OtXX32ZNu00Co+iVgV3ffkJVgVVcc0Sy56DdfJm+UQM=", + "rev": "29916453413845e54a65b8a1cf996842300cd299", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre998534.d233902339c0/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1003640.299164534138/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -97,11 +97,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1779000518, - "narHash": "sha256-wdtytSnzMe85J/qeXJALMzSLRFTZ1gBHwn81l1PtT8k=", + "lastModified": 1779824049, + "narHash": "sha256-dWHVUjP03KSVG1PaLKA6j9EdxWSxSQvipMUIcSyuA/U=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "5dde76b38418892ccb3d99e99bed7f8a43ac294c", + "rev": "1362178e5f5f7a848c49fe9dee004ef8824f100a", "type": "github" }, "original": { diff --git a/home-manager/luke.nix b/home-manager/luke.nix index 82b5763..d0240ff 100644 --- a/home-manager/luke.nix +++ b/home-manager/luke.nix @@ -47,6 +47,11 @@ }; }; + home.packages = with pkgs; [ + cargo + spotify-player + ]; + home = { username = "luke"; homeDirectory = "/home/luke"; diff --git a/home-manager/programs/niri/config.kdl b/home-manager/programs/niri/config.kdl index 9ada582..a9d97b2 100644 --- a/home-manager/programs/niri/config.kdl +++ b/home-manager/programs/niri/config.kdl @@ -276,7 +276,8 @@ layout { // This line starts waybar, a commonly used bar for Wayland compositors. spawn-at-startup "waybar" -spawn-at-startup "mako --default-timeout=5000" + +spawn-sh-at-startup "mako --default-timeout=5000" // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" @@ -291,7 +292,7 @@ hotkey-overlay { // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. // This option will also fix border/focus ring drawing behind some semitransparent windows. // After enabling or disabling this, you need to restart the apps for this to take effect. -// prefer-no-csd +prefer-no-csd // You can change the path where screenshots are saved. // A ~ at the front will be expanded to the home directory. diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 4075f72..b81b762 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -62,6 +62,12 @@ # FIXME: Add the rest of your current configuration + networking.firewall = { + enable = true; + allowedTCPPorts = [ 25565 ]; + allowedUDPPorts = [ 25565 ]; + }; + networking.extraHosts = " 10.0.0.194 thearcticcircle.ddns.net "; @@ -93,6 +99,8 @@ programs.gamescope.enable = true; environment.systemPackages = with pkgs; [ + #java, for minecraft + pkgs.jdk17 # Steam proton extras protonplus # Niri extras @@ -124,11 +132,12 @@ packages = [ "com.vivaldi.Vivaldi" "dev.vencord.Vesktop" - #"com.github.tchx84.Flatseal" + "com.github.tchx84.Flatseal" "com.heroicgameslauncher.hgl" - #"org.blender.Blender" - #"org.kde.krita" - #"com.mojang.Minecraft" + "org.blender.Blender" + "org.kde.krita" + "com.mojang.Minecraft" + "org.prismlauncher.PrismLauncher" ]; }; systemd.services.flatpak-repo = { @@ -163,6 +172,13 @@ # TODO: Be sure to add any other groups you need (such as networkmanager, audio, docker, etc) extraGroups = ["wheel" "sudo"]; }; + minecraft = { + isNormalUser = true; + shell = pkgs.bashInteractive; + openssh.authorizedKeys.keys = [ + # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect + ]; + }; }; # This setups a SSH server. Very important if you're setting up a headless system. diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index c75774b..3054bb5 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -32,6 +32,13 @@ options = [ "nofail" "rw" "user" "exec" ]; }; +#TEMPORARY, TODO: remove + fileSystems."/mnt/main" = { + device = "/dev/disk/by-uuid/7dfa47de-a2e2-4356-adb4-ea61cc9e3e7e"; + fsType = "ext4"; + options = [ "nofail" "ro" ]; + }; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";