diff --git a/flake.lock b/flake.lock index 63ed294..2d6d4e0 100644 --- a/flake.lock +++ b/flake.lock @@ -27,16 +27,16 @@ ] }, "locked": { - "lastModified": 1700392168, - "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -46,11 +46,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1699785596, - "narHash": "sha256-njXqFmAEju1qZFePg6E3sca4xVp3P3T/Dm+D+be1fQM=", + "lastModified": 1701153607, + "narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=", "owner": "Mic92", "repo": "nix-ld", - "rev": "35ba5d7e8e6f838121a422e25ca38a40c41b8636", + "rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701020860, - "narHash": "sha256-NwnRn04C8s+hH+KdVtGmVB1FFNIG7DtPJmQSCBDaET4=", + "lastModified": 1701656485, + "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b006ec52fce23b1d57f6ab4a42d7400732e9a0a2", + "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "lastModified": 1701693815, + "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573", "type": "github" }, "original": { @@ -107,16 +107,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700989516, - "narHash": "sha256-oKbmPa2wpTHh9XB3+zIx97uMZGNnp97GPliKKG2/plo=", + "lastModified": 1701539137, + "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2e4de209881b38392933fabf303cde3454b0b4c", + "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d5c4ac7..2188c07 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "nixos and macos configurations"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-ld.url = "github:Mic92/nix-ld"; diff --git a/home/default.nix b/home/default.nix index f8d557d..9e0838c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -16,7 +16,7 @@ }; inherit (pkgs) stdenv; in { - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; services = { gpg-agent = { @@ -139,7 +139,7 @@ in { enable = true; enableAutosuggestions = true; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; history.size = 1000000; localVariables = { @@ -211,13 +211,13 @@ in { k = "kubecolor"; kcx = "kubectx"; kns = "kubens"; - l = "exa -la --git --group-directories-first"; + l = "eza -la --git --group-directories-first"; m = "make"; pia = "sudo openvpn --config ~/pia/$(find ~/pia -execdir basename {} .ovpn ';' -iname \"*.ovpn\" -type f | fzf --exact).ovpn --auth-user-pass ~/pia/pass"; ps = "procs"; t = "tmux-sessionizer"; tf = "terraform"; - tree = "exa --tree"; + tree = "eza --tree"; v = "nvim"; nix-install = "nix-env -iA"; brew-x86 = "arch -x86_64 /usr/local/homebrew/bin/brew"; diff --git a/modules/common/fonts.nix b/modules/common/fonts.nix index 5f135eb..415d4b0 100644 --- a/modules/common/fonts.nix +++ b/modules/common/fonts.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ dejavu_fonts fira-code fira-code-symbols diff --git a/modules/common/linux.nix b/modules/common/linux.nix index c77ace5..e899d66 100644 --- a/modules/common/linux.nix +++ b/modules/common/linux.nix @@ -4,7 +4,7 @@ system = { autoUpgrade.enable = true; - stateVersion = "23.05"; + stateVersion = "23.11"; }; nix = { @@ -70,7 +70,7 @@ }; }; gnome.gnome-keyring.enable = true; - mullvad-vpn.enable = true; + mullvad-vpn.enable = false; printing.enable = true; resolved.enable = true; xserver = { diff --git a/modules/packages/common.nix b/modules/packages/common.nix index 6048eb3..1b3b9bb 100644 --- a/modules/packages/common.nix +++ b/modules/packages/common.nix @@ -26,7 +26,7 @@ in { # modern cli bat - exa + eza fd unstable.github-cli progress @@ -34,7 +34,6 @@ in { hadolint nodePackages.eslint oha - postman pre-commit ripgrep yq-go @@ -46,7 +45,6 @@ in { # containers krew - kube-score kubecolor kubectl kubectx diff --git a/modules/packages/linux.nix b/modules/packages/linux.nix index 92dc4b6..04898ea 100644 --- a/modules/packages/linux.nix +++ b/modules/packages/linux.nix @@ -55,12 +55,11 @@ in { qemu rustup ryujinx - steam-tui strace + tailscale traceroute unstable.obsidian unstable.signal-desktop - unstable.tailscale unstable.unityhub unstable.yuzu unstable.zoom-us