From f5278a918c18beb9656e1cc6a6952b29bde0d8d5 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Fri, 28 Mar 2025 20:48:27 +1100 Subject: [PATCH 1/7] Change dotnet config for Godot --- nixos/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index af08440..c5cc8d4 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -211,6 +211,7 @@ maven gradle gcc + dotnetCorePackages.sdk_8_0_3xx # noisetorch # yad @@ -239,7 +240,6 @@ libxkbcommon dbus libpulseaudio - dotnetCorePackages.dotnet_8.sdk dotnetCorePackages.sdk_8_0_3xx alsa-lib icu From 26806e7e570a9319acbb1be96afc4b41e75a95d0 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Fri, 28 Mar 2025 20:48:43 +1100 Subject: [PATCH 2/7] More unstable packages --- nixos/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c5cc8d4..bf1a542 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -178,12 +178,13 @@ # wget fzf nixfmt-rfc-style - dwarfs + unstable.dwarfs unrar mpv + unstable.waypipe - wineWowPackages.stable - winetricks + unstable.wineWowPackages.waylandFull + unstable.winetricks steamtinkerlaunch amdgpu_top From 36d8076b86e71cab301de596edba211a4e0e14f1 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Fri, 28 Mar 2025 20:52:49 +1100 Subject: [PATCH 3/7] Update locale --- nixos/configuration.nix | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index bf1a542..d132d53 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -46,19 +46,24 @@ # Set your time zone. time.timeZone = "Australia/Melbourne"; - # Select internationalisation properties. - i18n.defaultLocale = "en_GB.UTF-8"; + i18n = { - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_AU.UTF-8"; - LC_IDENTIFICATION = "en_AU.UTF-8"; - LC_MEASUREMENT = "en_AU.UTF-8"; - LC_MONETARY = "en_AU.UTF-8"; - LC_NAME = "en_AU.UTF-8"; - LC_NUMERIC = "en_AU.UTF-8"; - LC_PAPER = "en_AU.UTF-8"; - LC_TELEPHONE = "en_AU.UTF-8"; - LC_TIME = "en_AU.UTF-8"; + # Select internationalisation properties. + defaultLocale = "C.UTF-8"; + + extraLocaleSettings = { + LC_ADDRESS = "C.UTF-8"; + LC_IDENTIFICATION = "C.UTF-8"; + LC_MEASUREMENT = "C.UTF-8"; + LC_MONETARY = "C.UTF-8"; + LC_NAME = "C.UTF-8"; + LC_NUMERIC = "C.UTF-8"; + LC_PAPER = "C.UTF-8"; + LC_TELEPHONE = "C.UTF-8"; + LC_TIME = "C.UTF-8"; + }; + + supportedLocales = [ "all" ]; }; # Enable the X11 windowing system. @@ -113,6 +118,7 @@ extraGroups = [ "networkmanager" "wheel" + "video" "docker" "openrazer" "gamemode" @@ -139,6 +145,11 @@ programs.thunderbird.enable = true; programs.fish.enable = true; + programs.gpu-screen-recorder = { + enable = true; + package = unstable.gpu-screen-recorder; + }; + programs.corectrl = { enable = true; gpuOverclock = { From 3a835cf099d6b3d61cbe39405e41d08b4a20f632 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Fri, 28 Mar 2025 20:53:05 +1100 Subject: [PATCH 4/7] bump flake.lock --- nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 5cfd568..2f63f65 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1742996658, - "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "693840c01b9bef9e54100239cef937e53d4661bf", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { From 3007160e23d372af99ab8da09544226ce90d0b02 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:40:40 +1100 Subject: [PATCH 5/7] bump flake.lock --- nixos/flake.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 2f63f65..2435a5e 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1710515894, + "narHash": "sha256-tmQ9TMCb2jZY3jYdf53qIberkYV3dnUzdAYYK/NB+No=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "369d98c1b95b7b56d0859605916d7b81a7d1f1c4", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "cpu-microcodes": { "flake": false, "locked": { @@ -17,6 +33,27 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "nix-your-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710886643, + "narHash": "sha256-saTZuv9YeZ9COHPuj8oedGdUwJZcbQ3vyRqe7NVJMsQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "5bace74e9a65165c918205cf67ad3977fe79c584", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "home-manger": { "inputs": { "nixpkgs": [ @@ -37,6 +74,29 @@ "type": "github" } }, + "nix-your-shell": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1727198502, + "narHash": "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=", + "owner": "MercuryTechnologies", + "repo": "nix-your-shell", + "rev": "04dc6379eab87c128f2eca3f2238f533a95604b3", + "type": "github" + }, + "original": { + "owner": "MercuryTechnologies", + "repo": "nix-your-shell", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1742937945, @@ -56,11 +116,27 @@ "root": { "inputs": { "home-manger": "home-manger", + "nix-your-shell": "nix-your-shell", "nixpkgs": "nixpkgs", "ucodenix": "ucodenix", "unstable": "unstable" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "ucodenix": { "inputs": { "cpu-microcodes": "cpu-microcodes" @@ -81,11 +157,11 @@ }, "unstable": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { From ddfda9d813b94fb8d044fec776c73785afac1ee2 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:41:51 +1100 Subject: [PATCH 6/7] Move wine to home-manager --- nixos/configuration.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d132d53..99c4df2 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -193,10 +193,7 @@ unrar mpv unstable.waypipe - - unstable.wineWowPackages.waylandFull - unstable.winetricks - steamtinkerlaunch + unstable.nix-your-shell amdgpu_top mangohud From 30765ff3c4b3c3137b8412201c776e5ac9aa36c1 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:42:27 +1100 Subject: [PATCH 7/7] Add nix-your-shell so I can use fish in nix shells --- nixos/configuration.nix | 13 ++++++++++++- nixos/flake.nix | 9 +++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 99c4df2..7b11ade 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -7,6 +7,7 @@ pkgs, unstable, inputs, + nix-your-shell, ... }: @@ -15,6 +16,10 @@ # in { + nixpkgs.overlays = [ + nix-your-shell.overlays.default + ]; + nix.settings.experimental-features = [ "nix-command" "flakes" @@ -143,7 +148,13 @@ programs.firefox.enable = true; programs.thunderbird.enable = true; - programs.fish.enable = true; + programs.fish = { + enable = true; + interactiveShellInit = '' + nix-your-shell fish | source + ''; + }; + programs.gpu-screen-recorder = { enable = true; diff --git a/nixos/flake.nix b/nixos/flake.nix index e21ffc5..e210adc 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -10,12 +10,19 @@ # CPU microcode updater ucodenix.url = "github:e-tho/ucodenix"; + + nix-your-shell = { + url = "github:MercuryTechnologies/nix-your-shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; outputs = { nixpkgs, unstable, + nix-your-shell, ... }@inputs: let @@ -35,6 +42,8 @@ inherit system; config.allowUnfree = true; }; + + inherit nix-your-shell; }; modules = [ ./configuration.nix