diff --git a/flake.lock b/flake.lock index 02753e2f..f174457b 100644 --- a/flake.lock +++ b/flake.lock @@ -909,16 +909,15 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1679726555, - "narHash": "sha256-h7Dd/uWu7i5Yv1E+DweyJJUzTvGWXqfSo8/hz1YEolY=", - "owner": "toastal", + "lastModified": 1693588489, + "narHash": "sha256-hUGiONyurfBxmTtRUttdlkdq+ml16L1MiKKAS1047OE=", + "owner": "nixos", "repo": "nixos-hardware", - "rev": "0889479119961000c4a15801a0343cd1f11de556", + "rev": "fe0ea731b84b10143fc68cd557368ac70f0fb65c", "type": "github" }, "original": { - "owner": "toastal", - "ref": "z-series-no-hidpi", + "owner": "nixos", "repo": "nixos-hardware", "type": "github" } @@ -1101,16 +1100,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1693576890, - "narHash": "sha256-GvUL36la2tOjKRRRZkTSQFusbaCvItoZNA8UNIPLXeU=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30291c839a688a77c637024b99c9e10be398ea22", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "master", + "ref": "nixos-unstable", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 7e225b3e..dab0f582 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # * https://github.com/Infinidoge/nix-minecraft inputs = { - nixpkgs.url = "nixpkgs/master"; + nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs_stable.url = "nixpkgs/nixos-23.05"; @@ -32,7 +32,7 @@ nixos-generators.url = "github:nix-community/nixos-generators"; nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; - nixos-hardware.url = "github:toastal/nixos-hardware/z-series-no-hidpi"; + nixos-hardware.url = "github:nixos/nixos-hardware"; lanzaboote = { url = "github:nix-community/lanzaboote"; diff --git a/nixos/hosts/olympus/eevee/configuration.nix b/nixos/hosts/olympus/eevee/configuration.nix index 3860b43e..40987178 100644 --- a/nixos/hosts/olympus/eevee/configuration.nix +++ b/nixos/hosts/olympus/eevee/configuration.nix @@ -41,20 +41,20 @@ environment.sessionVariables.NIXOS_OZONE_WL = "1"; - services.kubo = { - enable = true; - enableGC = true; - # autoMount = true; - settings = { - Addresses.API = "/ip4/127.0.0.1/tcp/2324"; - Routing = { - AcceleratedDHTClient = true; - }; - Experimental = { - FilestoreEnabled = true; - }; - }; - }; + # services.kubo = { + # enable = true; + # enableGC = true; + # # autoMount = true; + # settings = { + # Addresses.API = "/ip4/127.0.0.1/tcp/2324"; + # Routing = { + # AcceleratedDHTClient = true; + # }; + # Experimental = { + # FilestoreEnabled = true; + # }; + # }; + # }; home-manager = { users.victor = import ./home; diff --git a/nixos/hosts/olympus/eevee/hardware.nix b/nixos/hosts/olympus/eevee/hardware.nix index f051d030..37c1a85c 100644 --- a/nixos/hosts/olympus/eevee/hardware.nix +++ b/nixos/hosts/olympus/eevee/hardware.nix @@ -5,7 +5,7 @@ services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.stable; # Open drivers cause gdm to crash # open = true; diff --git a/nixos/hosts/olympus/eevee/home/theme.nix b/nixos/hosts/olympus/eevee/home/theme.nix deleted file mode 100644 index aa462fc9..00000000 --- a/nixos/hosts/olympus/eevee/home/theme.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pkgs, config, ... }: -let - theme = "Catppuccin-Pink-Dark"; - cursorTheme = config.home.pointerCursor.name; -in { - home.pointerCursor = { - name = "Bibata-Modern-Classic"; - size = 24; - package = pkgs.bibata-cursors; - }; - - gtk = { - enable = true; - theme = { - name = theme; - package = pkgs.catppuccin-gtk; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme.override { color = "violet"; }; - }; - cursorTheme = { - name = cursorTheme; - inherit (config.home.pointerCursor) package size; - }; - }; - - programs.vscode = { - userSettings."workbench.colorTheme" = "Catppuccin Frappé"; - extensions = [ pkgs.vscode-extensions.catppuccin.catppuccin-vsc ]; - }; -} diff --git a/nixos/pkgs/plex-pass/sources.json b/nixos/pkgs/plex-pass/sources.json index f8fe4d0a..6851d7ee 100644 --- a/nixos/pkgs/plex-pass/sources.json +++ b/nixos/pkgs/plex-pass/sources.json @@ -1,14 +1,14 @@ [ { - "version": "1.32.6.7371", + "version": "1.32.6.7468", "platform": "aarch64-linux", - "url": "https://downloads.plex.tv/plex-media-server-new/1.32.6.7371-b6a09ad81/debian/plexmediaserver_1.32.6.7371-b6a09ad81_arm64.deb", - "hash": "0if5bwa824ijqss5h2airn36dhwn4krfg90jsw8sj7afw1llngf1" + "url": "https://downloads.plex.tv/plex-media-server-new/1.32.6.7468-07e0d4a7e/debian/plexmediaserver_1.32.6.7468-07e0d4a7e_arm64.deb", + "hash": "01sdhm307zsnsj893qch9h2yc07y7yijz5j0y4p223v29picr3h6" }, { - "version": "1.32.6.7371", + "version": "1.32.6.7468", "platform": "x86_64-linux", - "url": "https://downloads.plex.tv/plex-media-server-new/1.32.6.7371-b6a09ad81/debian/plexmediaserver_1.32.6.7371-b6a09ad81_amd64.deb", - "hash": "0dr0n7imf9vhvbq7398mjaf53qj1lw5lwjjia0aglg4idmhvgw7h" + "url": "https://downloads.plex.tv/plex-media-server-new/1.32.6.7468-07e0d4a7e/debian/plexmediaserver_1.32.6.7468-07e0d4a7e_amd64.deb", + "hash": "066hfidm25830xljj3ygq6vr142v2n4z3w94wnxfhxv2mx5fxall" } ]