diff --git a/common/desktop.nix b/common/linux-desktop.nix similarity index 84% rename from common/desktop.nix rename to common/linux-desktop.nix index 44e82ff..e09b491 100644 --- a/common/desktop.nix +++ b/common/linux-desktop.nix @@ -13,6 +13,4 @@ }; }; }; - - services.logrotate.checkConfig = false; } diff --git a/flake.lock b/flake.lock index 1cda243..d2699e5 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1667618048, - "narHash": "sha256-pKgavGAXBiugdKd93Z3A8hGpUmc3wkTSHlzqXd1cTo0=", + "lastModified": 1667708081, + "narHash": "sha256-FChEy05x4ed/pttjfTeKxjPCnHknMYrUtDyBiYbreT4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c728307482dacc9b2720b8036292b166c7865fa9", + "rev": "1ef0da321217c6c19b7a30509631c080a19321e5", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1667482890, - "narHash": "sha256-pua0jp87iwN7NBY5/ypx0s9L9CG49Ju/NI4wGwurHc4=", + "lastModified": 1667629849, + "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2a777538d971c6b01c6e54af89ddd6567c055e8", + "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "utils": { "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6aaedc3..eed3505 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,8 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; /* - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - */ + neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + */ nix-ld.url = "github:Mic92/nix-ld"; @@ -65,8 +65,8 @@ nixpkgs.overlays = [ (import ./modules/overlays) /* - inputs.neovim-nightly-overlay.overlay - */ + inputs.neovim-nightly-overlay.overlay + */ ]; home-manager = { @@ -78,11 +78,11 @@ }) ]; desktopLinuxModules = [ - ./common/desktop.nix + ./common/linux-desktop.nix ./common/linux.nix ./common/networking.nix ./common/printing.nix - ./packages/desktop.nix + ./packages/linux-desktop.nix ./packages/linux.nix ./services/keyleds/default.nix ./services/netdata/default.nix @@ -126,8 +126,8 @@ config = { nixpkgs.overlays = [ /* - inputs.neovim-nightly-overlay.overlay - */ + inputs.neovim-nightly-overlay.overlay + */ (import ./modules/overlays) ]; home-manager = { diff --git a/packages/desktop.nix b/packages/linux-desktop.nix similarity index 96% rename from packages/desktop.nix rename to packages/linux-desktop.nix index d1ac43e..26421ae 100644 --- a/packages/desktop.nix +++ b/packages/linux-desktop.nix @@ -32,12 +32,14 @@ in { guake kazam keyleds + obs-studio pavucontrol podman qemu signal-desktop slack steam-tui + superTuxKart usbutils virt-manager vlc diff --git a/packages/linux.nix b/packages/linux.nix index 011bb24..6fd3329 100644 --- a/packages/linux.nix +++ b/packages/linux.nix @@ -14,6 +14,7 @@ in { docker docker-compose glibcLocales + lm_sensors netdata pinentry-curses rfd