greg/nix-config
1
0
Fork 0
mirror of https://github.com/gburd/nix-config.git synced 2024-07-01 23:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

25.04

Browse source
This commit is contained in:
Gregory Burd 2024-06-06 11:17:28 -04:00
parent 28738853a5
commit 2e2524e3d2
25 changed files with 36 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/pixel6a/default.nix
View file

@ -40,7 +40,7 @@
time.timeZone = "America/Detroit"; time.timeZone = "America/Detroit";
# After installing home-manager channel like # After installing home-manager channel like
# nix-channel --add https://github.com/rycee/home-manager/archive/release-23.11.tar.gz home-manager # nix-channel --add https://github.com/rycee/home-manager/archive/release-24.05.tar.gz home-manager
# nix-channel --update # nix-channel --update
# you can configure home-manager in here like # you can configure home-manager in here like
#home-manager = { #home-manager = {
@ -50,7 +50,7 @@
# { config, lib, pkgs, ... }: # { config, lib, pkgs, ... }:
# { # {
# # Read the changelog before changing this value # # Read the changelog before changing this value
# home.stateVersion = "23.11"; # home.stateVersion = "24.05";
# #
# # insert home-manager config # # insert home-manager config
# }; # };

2
examples/dns-rpi.nix
View file

@ -227,5 +227,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }

16
flake.lock
View file

@ -603,16 +603,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714043624, "lastModified": 1717527182,
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", "rev": "845a5c4c073f74105022533907703441e0464bc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -1081,16 +1081,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1717159533, "lastModified": 1717555607,
"narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

8
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "Greg Burd's NixOS and Home Manager Configuration"; description = "Greg Burd's NixOS and Home Manager Configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# You can access packages and modules from different nixpkgs revs at the # You can access packages and modules from different nixpkgs revs at the
# same time. See 'unstable-packages' overlay in 'overlays/default.nix'. # same time. See 'unstable-packages' overlay in 'overlays/default.nix'.
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@ -13,7 +13,7 @@
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable";
# Chaotic's Nyx provides many additional packages like NordVPN # Chaotic's Nyx provides many additional packages like NordVPN
@ -34,7 +34,7 @@
devshells.url = "github:gburd/devshells"; devshells.url = "github:gburd/devshells";
devshells.inputs.nixpkgs.follows = "nixpkgs"; devshells.inputs.nixpkgs.follows = "nixpkgs";
# Android support with nix-on-droid. Currently not updated for 23.11 # Android support with nix-on-droid. Currently not updated for 24.05
nix-on-droid.url = "github:nix-community/nix-on-droid/release-23.05"; nix-on-droid.url = "github:nix-community/nix-on-droid/release-23.05";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
@ -67,7 +67,7 @@
} @ inputs: } @ inputs:
let let
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
stateVersion = "23.11"; stateVersion = "24.05";
inherit (self) outputs; inherit (self) outputs;
libx = import ./lib { inherit self inputs outputs stateVersion; }; libx = import ./lib { inherit self inputs outputs stateVersion; };

2
home-manager/_mixins/cli/default.nix
View file

@ -32,7 +32,7 @@
timer # To help with my ADHD paralysis timer # To help with my ADHD paralysis
nil # Nix LSP nil # Nix LSP
nixfmt # Nix formatter nixfmt-rfc-style # Nix formatter
nix-inspect # See which pkgs are in your PATH nix-inspect # See which pkgs are in your PATH
ltex-ls # Spell checking LSP ltex-ls # Spell checking LSP

5
home-manager/_mixins/cli/gpg.nix
View file

@ -2,7 +2,7 @@
let let
pinentry = pinentry =
if config.gtk.enable then { if config.gtk.enable then {
packages = [ pkgs.pinentry-gnome pkgs.gcr ]; packages = [ pkgs.pinentry-gnome3 pkgs.gcr ];
name = "gnome3"; name = "gnome3";
} else { } else {
packages = [ pkgs.pinentry-curses ]; packages = [ pkgs.pinentry-curses ];
@ -18,8 +18,7 @@ in
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
# TODO: sshKeys = [ "149F16412997785363112F3DBD713BC91D51B831" ]; # TODO: sshKeys = [ "149F16412997785363112F3DBD713BC91D51B831" ];
# TODO: pinentryFlavor = pinentry.name; pinentryPackage = pkgs.pinentry-curses;
pinentryFlavor = "curses";
enableExtraSocket = true; enableExtraSocket = true;
}; };

2
home-manager/_mixins/console/default.nix
View file

@ -13,7 +13,6 @@
packages = with pkgs; [ packages = with pkgs; [
asciinema # Terminal recorder asciinema # Terminal recorder
breezy # Terminal bzr client breezy # Terminal bzr client
butler # Terminal Itch.io API client
chafa # Terminal image viewer chafa # Terminal image viewer
dconf2nix # Nix code from Dconf files dconf2nix # Nix code from Dconf files
diffr # Modern Unix `diff` diffr # Modern Unix `diff`
@ -113,7 +112,6 @@
}; };
eza = { eza = {
enable = true; enable = true;
enableAliases = true;
icons = true; icons = true;
}; };
fish = { fish = {

2
home-manager/_mixins/console/systems/linux.nix
View file

@ -8,7 +8,7 @@
gpg-agent = { gpg-agent = {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentryFlavor = "curses"; pinentryPackage = pkgs.pinentry-curses;
}; };
}; };

1
home-manager/_mixins/emacs/burd.org
View file

@ -113,7 +113,6 @@
toml-mode toml-mode
web-mode web-mode
writegood-mode writegood-mode
ws-butler
yaml-mode)) yaml-mode))
#+end_src #+end_src
** Package Management ** Package Management

2
home-manager/_mixins/emacs/init.el
View file

@ -15,7 +15,7 @@
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(package-selected-packages '(package-selected-packages
(quote (quote
(yaml-mode ws-butler writegood-mode web-mode toml-mode terraform-mode solarized-theme sml-mode smex scala-mode rvm rust-mode restclient python-pep8 python-mode puppet-mode php-mode pastebin paredit o-blog nodejs-repl nixos-options nix-mode multi-web-mode marmalade markdown-mode magit lua-mode intellij-theme htmlize haskell-mode haml-mode hackernews graphviz-dot-mode google-this google-c-style go-mode gist flycheck-rust flycheck-pos-tip flycheck-ocaml flycheck-google-cpplint flycheck-cask flx-isearch flx-ido feature-mode erlang eredis elixir-mode elixir-mix deft csharp-mode company-cmake company-c-headers color-theme-sanityinc-tomorrow coffee-mode cmake-mode clojure-mode autopair ag ac-slime)))) (yaml-mode writegood-mode web-mode toml-mode terraform-mode solarized-theme sml-mode smex scala-mode rvm rust-mode restclient python-pep8 python-mode puppet-mode php-mode pastebin paredit o-blog nodejs-repl nixos-options nix-mode multi-web-mode marmalade markdown-mode magit lua-mode intellij-theme htmlize haskell-mode haml-mode hackernews graphviz-dot-mode google-this google-c-style go-mode gist flycheck-rust flycheck-pos-tip flycheck-ocaml flycheck-google-cpplint flycheck-cask flx-isearch flx-ido feature-mode erlang eredis elixir-mode elixir-mix deft csharp-mode company-cmake company-c-headers color-theme-sanityinc-tomorrow coffee-mode cmake-mode clojure-mode autopair ag ac-slime))))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

1
home-manager/_mixins/users/gburd/hosts/floki.nix
View file

@ -85,7 +85,6 @@ with lib.hm.gvariant;
dig dig
emacs emacs
file file
git-credential-1password
htop htop
openssl openssl
plocate plocate

2
nixos/_mixins/hardware/gtx-1080ti.nix
View file

@ -7,7 +7,7 @@ let
in in
{ {
environment = { environment = {
systemPackages = with pkgs; [ vulkan-tools nvtop ]; systemPackages = with pkgs; [ vulkan-tools nvtopPackages.full ];
variables = { variables = {
VK_DRIVER_FILES = builtins.concatStringsSep ":" vulkanDriverFiles; VK_DRIVER_FILES = builtins.concatStringsSep ":" vulkanDriverFiles;

2
nixos/_mixins/services/avahi.nix
View file

@ -2,7 +2,7 @@ _: {
services = { services = {
avahi = { avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
}; };
}; };
} }

2
nixos/_mixins/services/openssh.nix
View file

@ -36,5 +36,5 @@ in
networking.firewall.allowedTCPPorts = [ 22 ]; networking.firewall.allowedTCPPorts = [ 22 ];
# Passwordless sudo when SSH'ing with keys # Passwordless sudo when SSH'ing with keys
security.pam.enableSSHAgentAuth = true; security.pam.sshAgentAuth.enable = true;
} }

1
nixos/_mixins/users/gburd/desktop.nix
View file

@ -14,7 +14,6 @@
++ lib.optional (builtins.pathExists (../.. + "/desktop/${desktop}-apps.nix")) ../../desktop/${desktop}-apps.nix; ++ lib.optional (builtins.pathExists (../.. + "/desktop/${desktop}-apps.nix")) ../../desktop/${desktop}-apps.nix;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
authy
audio-recorder audio-recorder
gimp-with-plugins gimp-with-plugins
gnome.gnome-clocks gnome.gnome-clocks

2
nixos/default.nix
View file

@ -62,7 +62,7 @@
]; ];
}; };
time.timeZone = lib.mkDefault "America/New_York"; time.timeZone = lib.mkDefault "America/New_York";
services.xserver.layout = "us"; services.xserver.xkb.layout = "us";
# Increase open file limit for sudoers # Increase open file limit for sudoers
security.pam.loginLimits = [ security.pam.loginLimits = [

2
nixos/sd-card/default.nix
View file

@ -13,5 +13,5 @@
]; ];
}; };
system.stateVersion = "23.11"; system.stateVersion = "24.05";
} }

2
nixos/server/pxe-server/default.nix
View file

@ -136,5 +136,5 @@ in
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }

6
nixos/workstation/floki/default.nix
View file

@ -60,11 +60,11 @@
font-size=12 font-size=12
xkb-layout=us xkb-layout=us
''; '';
services.xserver.layout = lib.mkForce "us"; services.xserver.xkb.layout = lib.mkForce "us";
services.xserver.xkbOptions = "ctrl:swapcaps"; services.xserver.xkb.options = "ctrl:swapcaps";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nvtop-amd nvtopPackages.full
man-pages man-pages
man-pages-posix man-pages-posix
]; ];

2
sdcard/rpi2.nix
View file

@ -13,5 +13,5 @@
]; ];
}; };
system.stateVersion = "23.11"; system.stateVersion = "24.05";
} }

4
shell.nix
View file

@ -23,11 +23,11 @@
kubectl kubectl
]; ];
}; };
#services.dbus.packages = [ pkgs.gcr ]; services.dbus.packages = [ pkgs.gcr ];
#services.pcscd.enable = true; #services.pcscd.enable = true;
services.gnupg.agent = { services.gnupg.agent = {
enable = true; enable = true;
pinentryFlavor = "curses"; pinentryPackage = pkgs.pinentry-curses;
enableSSHSupport = true; enableSSHSupport = true;
}; };
} }

2
shells/code-format/flake.nix
View file

@ -2,7 +2,7 @@
description = "Nix shell for code-format tools"; description = "Nix shell for code-format tools";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };

2
shells/file-sync/flake.nix
View file

@ -2,7 +2,7 @@
description = "Nix shell for file sync tools"; description = "Nix shell for file sync tools";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };

2
shells/gpu/flake.nix
View file

@ -2,7 +2,7 @@
description = "Nix shell for GPU tools"; description = "Nix shell for GPU tools";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };

2
shells/network/flake.nix
View file

@ -2,7 +2,7 @@
description = "Nix shell for network tools"; description = "Nix shell for network tools";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };