geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 8 Pull requests Releases Activity

Upgrade to NixOS 23.11

Browse source
This commit is contained in:
Geoffrey Frogeye 2023-11-30 19:02:32 +01:00
parent bc4676dec0
commit 5ee5e5fc52
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
6 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
add_channels.sh
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# TODO Surely there's more elegant? # TODO Flakes
nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs nix-channel --add https://nixos.org/channels/nixos-23.11 nixpkgs
# Below probably only needed on non-NixOS nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager nix-channel --add https://github.com/NixOS/nixos-hardware/archive/8772491ed75f150f02552c60694e1beff9f46013.tar.gz nixos-hardware
nix-channel --update nix-channel --update

2
hm/extra.nix
View file

@ -47,7 +47,7 @@
# TODO wine-gecko wine-mono lib32-libpulse (?) # TODO wine-gecko wine-mono lib32-libpulse (?)
# gaming # gaming
steam # steam # FIXME Requires i686-linux or something. IIRC the package says to use the NixOS config and not it directly.
yuzu-mainline yuzu-mainline
minecraft minecraft
# TODO factorio # TODO factorio

3
hm/style.nix
View file

@ -2,7 +2,8 @@
let let
stylix = builtins.fetchGit { stylix = builtins.fetchGit {
url = "https://github.com/danth/stylix.git"; url = "https://github.com/danth/stylix.git";
ref = "release-23.05"; # No 23.11 branch last I checked
rev = "8b3f61727f3b86c27096c3c014ae602aa40670ba";
}; };
in in
{ {

9
hm/vim.nix
View file

@ -2,7 +2,7 @@
let let
nixvim = import (builtins.fetchGit { nixvim = import (builtins.fetchGit {
url = "https://github.com/nix-community/nixvim"; url = "https://github.com/nix-community/nixvim";
ref = "nixos-23.05"; ref = "nixos-23.11";
}); });
vim-shot-f = pkgs.vimUtils.buildVimPluginFrom2Nix { vim-shot-f = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-shot-f"; pname = "vim-shot-f";
@ -199,8 +199,7 @@ in
# TODO Could add some, could also remove some # TODO Could add some, could also remove some
}; };
}; };
# FIXME phpactor. Only from 23.11 phpactor.enable = true; # PHP
# phpactor.enable = true; # PHP
rnix-lsp.enable = true; # Nix rnix-lsp.enable = true; # Nix
# FIXME sqlls # FIXME sqlls
yamlls.enable = true; # YAML yamlls.enable = true; # YAML
@ -226,7 +225,7 @@ in
# indent = true; # Not very working last time I tried apparently # indent = true; # Not very working last time I tried apparently
}; };
# TODO Investigate https://github.com/nvim-treesitter/nvim-treesitter-textobjects # TODO Investigate https://github.com/nvim-treesitter/nvim-treesitter-textobjects
indent-blankline.enable = true; # 23.11 integrate with rainbow-delimiters and use more of the options indent-blankline.enable = true; # TODO integrate with rainbow-delimiters and use more of the options
undotree.enable = true; # Navigate edition history undotree.enable = true; # Navigate edition history
@ -270,7 +269,7 @@ in
# Treesitter # Treesitter
nvim-ts-rainbow # Randomly color parenthesis pairs nvim-ts-rainbow # Randomly color parenthesis pairs
# 23.11: Replace with plugins.rainbow-delimiters # TODO Replace with plugins.rainbow-delimiters
# Snippets # Snippets
vim-vsnip vim-vsnip

1
os/common.nix
View file

@ -55,7 +55,6 @@
chrony = { chrony = {
enable = true; enable = true;
servers = map (n: "${toString n}.europe.pool.ntp.org") (lib.lists.range 0 3); servers = map (n: "${toString n}.europe.pool.ntp.org") (lib.lists.range 0 3);
extraConfig = "rtcsync"; # See 23.11 release notes
}; };
# Prevent power button from shutting down the computer. # Prevent power button from shutting down the computer.

2
os/geoffrey.nix
View file

@ -1,7 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
"${builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"}/nixos" <home-manager/nixos>
]; ];
users.users.geoffrey = { users.users.geoffrey = {