tstarr/dotfiles
1
0
Fork 0
mirror of https://github.com/starr-dusT/dotfiles.git synced 2025-05-19 02:46:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

update from NixOS 23.05 to NixOS unstable

Browse Source
This commit is contained in:
Tyler Starr 2023-11-23 01:21:58 -08:00
parent 861cbe745b
commit a4dd272bb1
18 changed files with 61 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
provision/flake.lock generated
View File

@ -7,16 +7,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700392168, "lastModified": 1700695018,
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", "rev": "134deb46abd5d0889d913b8509413f6f38b0811e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -24,31 +23,32 @@
"jovian-nixos": { "jovian-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1698485410, "lastModified": 1700377627,
"narHash": "sha256-+O5Acu2n4XQnT4M25W/oH5MLqXy4pFBFhBzKBFOF7Ik=", "narHash": "sha256-MrYHE/oWqVVwyV9n2MbtAHWplCkLvCcvLj3TOkyHD5k=",
"rev": "fd7753956149d4e8b19a810eed445d1a52aecd30", "ref": "development",
"revCount": 459, "rev": "1ccd4c94521ef7e6678f9d918dbee703d116dd76",
"revCount": 514,
"type": "git", "type": "git",
"url": "https://github.com/Jovian-Experiments/Jovian-NixOS" "url": "https://github.com/Jovian-Experiments/Jovian-NixOS"
}, },
"original": { "original": {
"rev": "fd7753956149d4e8b19a810eed445d1a52aecd30", "ref": "development",
"type": "git", "type": "git",
"url": "https://github.com/Jovian-Experiments/Jovian-NixOS" "url": "https://github.com/Jovian-Experiments/Jovian-NixOS"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700272409, "lastModified": 1700390070,
"narHash": "sha256-Mge6iOvomplBsvQ47sIeVAwAUGSVXH4qCW4pLUt/qMI=", "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8e5e424b1c059e9ccf5db6a652458e30de05fa3a", "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -69,22 +69,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1700204040,
"narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1700108881, "lastModified": 1700108881,
@ -106,7 +90,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"jovian-nixos": "jovian-nixos", "jovian-nixos": "jovian-nixos",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },

19
provision/flake.nix
View File

@ -2,37 +2,32 @@
description = "Flake for nixos configurations"; description = "Flake for nixos configurations";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = github:nix-community/home-manager/release-23.05; url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
jovian-nixos = { jovian-nixos = {
url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?rev=fd7753956149d4e8b19a810eed445d1a52aecd30"; url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?ref=development";
flake = false; flake = false;
}; };
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
}; };
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, home-manager, jovian-nixos, sops-nix, ... }: outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, sops-nix, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
lib = nixpkgs.lib; lib = nixpkgs.lib;
user = "tstarr"; user = "tstarr";
in { in {
nixosConfigurations = { nixosConfigurations = {
kestrel = lib.nixosSystem { kestrel = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit user; inherit pkgs-unstable; }; specialArgs = { inherit user; };
modules = [ modules = [
./modules ./modules
./hosts/kestrel/configuration.nix ./hosts/kestrel/configuration.nix
@ -54,7 +49,7 @@
torus = lib.nixosSystem { torus = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit user; inherit pkgs-unstable; }; specialArgs = { inherit user; };
modules = [ modules = [
./modules ./modules
./hosts/torus/configuration.nix ./hosts/torus/configuration.nix
@ -76,7 +71,7 @@
bulwark = lib.nixosSystem { bulwark = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit user; inherit pkgs-unstable; inherit jovian-nixos; inherit home-manager; }; specialArgs = { inherit user; inherit jovian-nixos; inherit home-manager; };
modules = [ modules = [
./modules ./modules
./hosts/bulwark/configuration.nix ./hosts/bulwark/configuration.nix

6
provision/hosts/bulwark/configuration.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, user, ... }: { config, lib, pkgs, user, ... }:
{ {
imports = [ imports = [
./steam-deck.nix ./steam-deck.nix
@ -42,7 +42,7 @@
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
# Add fonts # Add fonts
fonts.fonts = with pkgs; [ fonts.packages= with pkgs; [
nerdfonts nerdfonts
]; ];
@ -99,5 +99,5 @@
}; };
# Did you read the comment? # Did you read the comment?
system.stateVersion = "23.05"; system.stateVersion = "23.11";
} }

2
provision/hosts/bulwark/home-configuration.nix
View File

@ -18,5 +18,5 @@
#modules = { #modules = {
#}; #};
home.stateVersion = "23.05"; home.stateVersion = "23.11";
} }

2
provision/hosts/bulwark/steam-deck.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, user, jovian-nixos, home-manager, ... }: { config, lib, pkgs, user, jovian-nixos, home-manager, ... }:
{ {
imports = [ imports = [
(jovian-nixos + "/modules") (jovian-nixos + "/modules")

5
provision/hosts/bulwark/syncthing.nix
View File

@ -8,14 +8,15 @@
services.syncthing = { services.syncthing = {
enable = true; enable = true;
user = "${user}"; user = "${user}";
dataDir = "/home/${user}";
configDir = "/home/${user}/.config/syncthing"; configDir = "/home/${user}/.config/syncthing";
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
devices = { settings.devices = {
"kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; }; "kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; };
}; };
folders = { settings.folders = {
"Gamecube Saves" = { "Gamecube Saves" = {
path = "/home/${user}/.local/share/dolphin-emu/GC"; path = "/home/${user}/.local/share/dolphin-emu/GC";
devices = [ "kestrel" ]; devices = [ "kestrel" ];

6
provision/hosts/kestrel/configuration.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, user, lib, ... }: { config, pkgs, user, lib, ... }:
{ {
imports = [ imports = [
./syncthing.nix ./syncthing.nix
@ -44,7 +44,7 @@
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
# Add fonts # Add fonts
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts nerdfonts
]; ];
@ -111,5 +111,5 @@
}; };
# Did you read the comment? # Did you read the comment?
system.stateVersion = "23.05"; system.stateVersion = "23.11";
} }

2
provision/hosts/kestrel/home-configuration.nix
View File

@ -28,5 +28,5 @@
}; };
}; };
home.stateVersion = "23.05"; home.stateVersion = "23.11";
} }

5
provision/hosts/kestrel/syncthing.nix
View File

@ -8,15 +8,16 @@
services.syncthing = { services.syncthing = {
enable = true; enable = true;
user = "${user}"; user = "${user}";
dataDir = "/home/${user}";
configDir = "/home/${user}/.config/syncthing"; configDir = "/home/${user}/.config/syncthing";
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
devices = { settings.devices = {
"bulwark" = { id = "B5HZK2V-WA4WSQF-3JAIH4I-C6XQZ6J-EMMAIV5-CCYOA5G-N57GT6A-WH2GCQ2"; }; "bulwark" = { id = "B5HZK2V-WA4WSQF-3JAIH4I-C6XQZ6J-EMMAIV5-CCYOA5G-N57GT6A-WH2GCQ2"; };
"torus" = { id = "WCZYHD7-5Y33SSU-74JHAQR-V7LYMDM-SDG2NTN-DJ2VKF2-DUBBUE5-PU5CGQN"; }; "torus" = { id = "WCZYHD7-5Y33SSU-74JHAQR-V7LYMDM-SDG2NTN-DJ2VKF2-DUBBUE5-PU5CGQN"; };
}; };
folders = { settings.folders = {
"Gamecube Saves" = { "Gamecube Saves" = {
path = "/home/${user}/.local/share/dolphin-emu/GC"; path = "/home/${user}/.local/share/dolphin-emu/GC";
devices = [ "bulwark" ]; devices = [ "bulwark" ];

2
provision/hosts/torus/configuration.nix
View File

@ -154,5 +154,5 @@
}; };
}; };
# Did you read the comment? # Did you read the comment?
system.stateVersion = "23.05"; system.stateVersion = "23.11";
} }

2
provision/hosts/torus/home-configuration.nix
View File

@ -13,5 +13,5 @@
#modules = { #modules = {
#}; #};
home.stateVersion = "23.05"; home.stateVersion = "23.11";
} }

5
provision/hosts/torus/syncthing.nix
View File

@ -8,14 +8,15 @@
services.syncthing = { services.syncthing = {
enable = true; enable = true;
user = "${user}"; user = "${user}";
dataDir = "/home/${user}";
configDir = "/home/${user}/.config/syncthing"; configDir = "/home/${user}/.config/syncthing";
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
devices = { settings.devices = {
"kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; }; "kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; };
}; };
folders = { settings.folders = {
}; };
}; };
} }

4
provision/modules/desktop/browser.nix
View File

@ -1,11 +1,11 @@
{ config, lib, pkgs, pkgs-unstable, user, ... }: { config, lib, pkgs, user, ... }:
let cfg = config.modules.desktop.browser; let cfg = config.modules.desktop.browser;
in { in {
options.modules.desktop.browser.enable = lib.mkEnableOption "browser"; options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs-unstable; [ environment.systemPackages = with pkgs; [
chromium chromium
google-chrome google-chrome
play-with-mpv play-with-mpv

2
provision/modules/desktop/sway.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, user, ... }: { config, lib, pkgs, user, ... }:
let let
cfg = config.modules.desktop.sway; cfg = config.modules.desktop.sway;

5
provision/modules/devel/engineering.nix
View File

@ -1,6 +1,6 @@
# CAD and 3d printing and everything nice # CAD and 3d printing and everything nice
{ config, lib, pkgs, pkgs-unstable, user, ... }: { config, lib, pkgs, user, ... }:
let let
cfg = config.modules.devel.engineering; cfg = config.modules.devel.engineering;
@ -11,9 +11,6 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
super-slicer super-slicer
blender blender
] ++ [
# Freecad is broken right now (https://github.com/NixOS/nixpkgs/issues/263452)
#pkgs-unstable.freecad
]; ];
}; };
} }

5
provision/modules/devel/notes.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, user, ... }: { config, lib, pkgs, user, ... }:
let let
cfg = config.modules.devel.notes; cfg = config.modules.devel.notes;
@ -8,12 +8,11 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pandoc pandoc
gollum gollum
obsidian
zk zk
# for zk # for zk
bat bat
fzf fzf
] ++ [
pkgs-unstable.obsidian
]; ];
}; };
} }

20
provision/modules/gaming/steam.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, user, ... }: { config, lib, pkgs, user, ... }:
let cfg = config.modules.gaming.steam; let cfg = config.modules.gaming.steam;
in { in {
@ -14,15 +14,15 @@ in {
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;
environment.systemPackages = [ environment.systemPackages = with pkgs; [
pkgs.steam steam
pkgs.steamtinkerlaunch steamtinkerlaunch
pkgs.yuzu-early-access yuzu-early-access
pkgs.dolphin-emu dolphin-emu
pkgs.ppsspp ppsspp
pkgs.mgba mgba
pkgs-unstable.sunshine sunshine
pkgs-unstable.moonlight-qt moonlight-qt
]; ];
}; };

12
provision/modules/system/terminal.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, user, ... }: { config, lib, pkgs, user, ... }:
let cfg = config.modules.system.terminal; let cfg = config.modules.system.terminal;
in { in {
@ -34,14 +34,12 @@ in {
# for neovim # for neovim
nodejs nodejs
ripgrep ripgrep
# taskwarrior
taskopen
] ++ [ taskwarrior
pkgs-unstable.taskwarrior
# for taskwarrior # for taskwarrior
pkgs-unstable.taskwarrior-tui taskopen
pkgs-unstable.timewarrior taskwarrior-tui
timewarrior
]; ];
}; };