Compare commits

...

7 commits

Author SHA1 Message Date
BuyMyMojo
30765ff3c4
Add nix-your-shell so I can use fish in nix shells 2025-03-29 21:42:27 +11:00
BuyMyMojo
ddfda9d813
Move wine to home-manager 2025-03-29 21:41:51 +11:00
BuyMyMojo
3007160e23
bump flake.lock 2025-03-29 21:40:40 +11:00
BuyMyMojo
3a835cf099
bump flake.lock 2025-03-28 20:53:05 +11:00
BuyMyMojo
36d8076b86
Update locale 2025-03-28 20:52:49 +11:00
BuyMyMojo
26806e7e57
More unstable packages 2025-03-28 20:48:43 +11:00
BuyMyMojo
f5278a918c
Change dotnet config for Godot 2025-03-28 20:48:27 +11:00
3 changed files with 133 additions and 28 deletions

View file

@ -7,6 +7,7 @@
pkgs, pkgs,
unstable, unstable,
inputs, inputs,
nix-your-shell,
... ...
}: }:
@ -15,6 +16,10 @@
# in # in
{ {
nixpkgs.overlays = [
nix-your-shell.overlays.default
];
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
@ -46,19 +51,24 @@
# Set your time zone. # Set your time zone.
time.timeZone = "Australia/Melbourne"; time.timeZone = "Australia/Melbourne";
# Select internationalisation properties. i18n = {
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = { # Select internationalisation properties.
LC_ADDRESS = "en_AU.UTF-8"; defaultLocale = "C.UTF-8";
LC_IDENTIFICATION = "en_AU.UTF-8";
LC_MEASUREMENT = "en_AU.UTF-8"; extraLocaleSettings = {
LC_MONETARY = "en_AU.UTF-8"; LC_ADDRESS = "C.UTF-8";
LC_NAME = "en_AU.UTF-8"; LC_IDENTIFICATION = "C.UTF-8";
LC_NUMERIC = "en_AU.UTF-8"; LC_MEASUREMENT = "C.UTF-8";
LC_PAPER = "en_AU.UTF-8"; LC_MONETARY = "C.UTF-8";
LC_TELEPHONE = "en_AU.UTF-8"; LC_NAME = "C.UTF-8";
LC_TIME = "en_AU.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. # Enable the X11 windowing system.
@ -113,6 +123,7 @@
extraGroups = [ extraGroups = [
"networkmanager" "networkmanager"
"wheel" "wheel"
"video"
"docker" "docker"
"openrazer" "openrazer"
"gamemode" "gamemode"
@ -137,7 +148,18 @@
programs.firefox.enable = true; programs.firefox.enable = true;
programs.thunderbird.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;
package = unstable.gpu-screen-recorder;
};
programs.corectrl = { programs.corectrl = {
enable = true; enable = true;
@ -178,13 +200,11 @@
# wget # wget
fzf fzf
nixfmt-rfc-style nixfmt-rfc-style
dwarfs unstable.dwarfs
unrar unrar
mpv mpv
unstable.waypipe
wineWowPackages.stable unstable.nix-your-shell
winetricks
steamtinkerlaunch
amdgpu_top amdgpu_top
mangohud mangohud
@ -211,6 +231,7 @@
maven maven
gradle gradle
gcc gcc
dotnetCorePackages.sdk_8_0_3xx
# noisetorch # noisetorch
# yad # yad
@ -239,7 +260,6 @@
libxkbcommon libxkbcommon
dbus dbus
libpulseaudio libpulseaudio
dotnetCorePackages.dotnet_8.sdk
dotnetCorePackages.sdk_8_0_3xx dotnetCorePackages.sdk_8_0_3xx
alsa-lib alsa-lib
icu icu

94
nixos/flake.lock generated
View file

@ -1,5 +1,21 @@
{ {
"nodes": { "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": { "cpu-microcodes": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -17,6 +33,27 @@
"type": "github" "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": { "home-manger": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -24,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742996658, "lastModified": 1743136572,
"narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "693840c01b9bef9e54100239cef937e53d4661bf", "rev": "1efd2503172016a6742c87b47b43ca2c8145607d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,13 +74,36 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742751704, "lastModified": 1742937945,
"narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +116,27 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manger": "home-manger", "home-manger": "home-manger",
"nix-your-shell": "nix-your-shell",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"ucodenix": "ucodenix", "ucodenix": "ucodenix",
"unstable": "unstable" "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": { "ucodenix": {
"inputs": { "inputs": {
"cpu-microcodes": "cpu-microcodes" "cpu-microcodes": "cpu-microcodes"
@ -81,11 +157,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1742889210, "lastModified": 1743095683,
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "698214a32beb4f4c8e3942372c694f40848b360d", "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -10,12 +10,19 @@
# CPU microcode updater # CPU microcode updater
ucodenix.url = "github:e-tho/ucodenix"; ucodenix.url = "github:e-tho/ucodenix";
nix-your-shell = {
url = "github:MercuryTechnologies/nix-your-shell";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
{ {
nixpkgs, nixpkgs,
unstable, unstable,
nix-your-shell,
... ...
}@inputs: }@inputs:
let let
@ -35,6 +42,8 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
inherit nix-your-shell;
}; };
modules = [ modules = [
./configuration.nix ./configuration.nix