diff --git a/flake.lock b/flake.lock index 0e0e450..e17ba89 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -34,21 +34,87 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1709953765, - "narHash": "sha256-91LK3Ur3sy1jrh8Du8f+4maRVhcFNmwd6TBv7AxLGQU=", + "lastModified": 1719915468, + "narHash": "sha256-2a+aQbaAqFNySNXZ9l44tebNmXnAfAzqj+Tw4JRUvqc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3e930a568a76a810dde6bcabcf737a81850e7153", + "rev": "2fa57f2dc4909be697d003a22ce6870039e4db9b", "type": "github" }, "original": { @@ -61,19 +127,21 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -83,6 +151,35 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { "inputs": { "nixpkgs": [ "hyprland", @@ -94,16 +191,41 @@ ] }, "locked": { - "lastModified": 1709775675, - "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", + "repo": "hyprutils", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -126,16 +248,19 @@ "nix": { "inputs": { "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", "libgit2": "libgit2", "nixpkgs": "nixpkgs_2", - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709945384, - "narHash": "sha256-7jY7r1vyUTqVX+hEACdgvpQVoKhii2muoIJYc5w8bRo=", + "lastModified": 1719873912, + "narHash": "sha256-i+qQmaneLQKD/LYgZuCp+/dkyiqUW9+b9rSQ1i2oZCQ=", "owner": "NixOS", "repo": "nix", - "rev": "3120fef01b0b78ab156865226839295b27694271", + "rev": "80d67d603b68d5b1eae468c8be3016117dcaefb2", "type": "github" }, "original": { @@ -146,11 +271,11 @@ }, "nixlib": { "locked": { - "lastModified": 1709426687, - "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -167,11 +292,11 @@ ] }, "locked": { - "lastModified": 1709887845, - "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=", + "lastModified": 1719841141, + "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "bef32a05496d9480b02be586fa7827748b9e597b", + "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", "type": "github" }, "original": { @@ -182,11 +307,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1709410583, - "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -197,11 +322,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -211,24 +336,34 @@ "type": "github" } }, - "nixpkgs-lib": { + "nixpkgs-23-11": { "locked": { - "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" }, "original": { - "dir": "lib", "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -247,11 +382,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -262,35 +397,67 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1709884566, - "narHash": "sha256-NSYJg2sfdO/XS3L8XN/59Zhzn0dqWm7XtVnKI2mHq3w=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2be119add7b37dc535da2dd4cba68e2cf8d1517e", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.11", "type": "indirect" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "nix" + ], + "flake-utils": "flake-utils", + "gitignore": [ + "nix" + ], + "nixpkgs": [ + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -317,31 +484,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -356,11 +501,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a4c2bac..cd305ad 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nix.url = "github:NixOS/nix"; - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; diff --git a/machines/configuration_old.nix b/machines/configuration_old.nix index 2ebb3b6..d0e0dbf 100644 --- a/machines/configuration_old.nix +++ b/machines/configuration_old.nix @@ -63,7 +63,6 @@ services.printing.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/machines/jupiter-server/configuration.nix b/machines/jupiter-server/configuration.nix deleted file mode 100644 index 05c852a..0000000 --- a/machines/jupiter-server/configuration.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - imports = [ - - ./disks.nix - ./hardware-configuration.nix - ./environments.nix - ]; - - networking.hostName = "jupiter-server"; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.unstable.linuxPackages_latest; - - # Configure keymap in X11 - services.xserver = { - layout = "de"; - xkbVariant = ""; - }; - - # Configure console keymap - console.keyMap = "de"; - - system = { - stateVersion = "23.05"; - autoUpgrade.enable = true; - }; -} diff --git a/machines/jupiter-server/disks.nix b/machines/jupiter-server/disks.nix deleted file mode 100644 index 1c70e5e..0000000 --- a/machines/jupiter-server/disks.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: - -#TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it - -{ - fileSystems."/" = - { device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0D77-17BB"; - fsType = "vfat"; - }; -} diff --git a/machines/jupiter-server/environments.nix b/machines/jupiter-server/environments.nix deleted file mode 100644 index 4de0d21..0000000 --- a/machines/jupiter-server/environments.nix +++ /dev/null @@ -1,20 +0,0 @@ -# enabled profiles -{ config, lib, ... }: -let - secrets = config.sops.secrets; -in -{ - my.profiles = { - hyprland.enable = false; - zsh.enable = true; - apps = { - desktop_apps = false; - dev_apps = true; - gnome_apps = false; - }; - }; - - my.hardware = { - bluetooth.enable = true; - }; -} \ No newline at end of file diff --git a/machines/jupiter-server/hardware-configuration.nix b/machines/jupiter-server/hardware-configuration.nix deleted file mode 100644 index 6d6c886..0000000 --- a/machines/jupiter-server/hardware-configuration.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0D77-17BB"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix index 0725066..9a62d6d 100644 --- a/machines/jupiter/configuration.nix +++ b/machines/jupiter/configuration.nix @@ -14,6 +14,16 @@ boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.unstable.linuxPackages_latest; + # Shitfuck SOnar Dotnet dependency + nixpkgs.config = { + permittedInsecurePackages = [ + "aspnetcore-runtime-6.0.36" + "aspnetcore-runtime-wrapped-6.0.36" + "dotnet-sdk-6.0.428" + "dotnet-sdk-wrapped-6.0.428" + ]; + }; + # Enable the X11 windowing system. # services.xserver.enable = true; @@ -38,8 +48,6 @@ # Enable CUPS to print documents. services.printing.enable = true; - # Enable sound with pipewire. - sound.enable = true; security.rtkit.enable = true; system = { diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index 3dfde9b..3a28256 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -19,5 +19,4 @@ options = [ "x-systemd.automount" "noauto" ]; }; - } diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 84c331a..e9b0e91 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -12,6 +12,7 @@ in dev_apps = false; gnome_apps = false; }; + kde-desktop.enable = false; radarr.enable = true; docker.enable = true; readarr.enable = true; @@ -19,7 +20,7 @@ in jellyfin.enable = true; jellyseerr.enable = true; paperless = { - enable = true; + enable = false; port = 28981; # Optional, to override the default port extraConfig = { PAPERLESS_ADMIN_USER = "finn"; @@ -32,4 +33,4 @@ in my.hardware = { bluetooth.enable = true; }; -} \ No newline at end of file +} diff --git a/machines/jupiter/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix index 903b09f..c0a9146 100644 --- a/machines/jupiter/hardware-configuration.nix +++ b/machines/jupiter/hardware-configuration.nix @@ -49,6 +49,6 @@ # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/machines/mibook/configuration.nix b/machines/mibook/configuration.nix index 89c8b2d..afc02aa 100644 --- a/machines/mibook/configuration.nix +++ b/machines/mibook/configuration.nix @@ -35,7 +35,6 @@ services.printing.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index 26ba617..8dbaf54 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -17,15 +17,18 @@ let firefox thunderbird google-chrome + xfce.thunar + vscode discord spotify keepassxc nextcloud-client neovim pipewire + vlc wireplumber + numix-icon-theme ] ++ lib.optionals cfg.dev_apps [ - vscode jetbrains.webstorm jetbrains.goland jetbrains.pycharm-professional @@ -37,4 +40,4 @@ let gnome.gnome-tweaks ]; }; - } \ No newline at end of file + } diff --git a/modules/environments/default.nix b/modules/environments/default.nix index 1a6c3c2..b5c80ec 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -8,6 +8,7 @@ ./prowlarr ./radarr ./docker + ./kde-desktop ./readarr ./sonarr ./jellyfin diff --git a/modules/environments/hyprland/default.nix b/modules/environments/hyprland/default.nix index 2f28584..ff03179 100644 --- a/modules/environments/hyprland/default.nix +++ b/modules/environments/hyprland/default.nix @@ -9,7 +9,6 @@ let config = lib.mkIf cfg.enable { programs.hyprland = { enable = true; - nvidiaPatches = true; xwayland.enable = true; }; users.users.finn.packages = with pkgs; [ diff --git a/modules/environments/kde-desktop/default.nix b/modules/environments/kde-desktop/default.nix new file mode 100644 index 0000000..09e7341 --- /dev/null +++ b/modules/environments/kde-desktop/default.nix @@ -0,0 +1,23 @@ +# KDE Desktio Environment +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.kde-desktop; + # domain = config.networking.domain; + # port = 9696; +in +{ + options.my.profiles.kde-desktop = with lib; { + enable = mkEnableOption "KDE Desktop Environment"; + }; + + config = lib.mkIf cfg.enable { + services.xserver = { + enable = true; + displayManager.sddm.enable = true; + desktopManager.plasma5.enable = true; + }; + users.users.finn.packages = with pkgs; [ + latte-dock + ]; + }; +} \ No newline at end of file diff --git a/modules/environments/paperless/default.nix b/modules/environments/paperless/default.nix index 10faabd..2865247 100644 --- a/modules/environments/paperless/default.nix +++ b/modules/environments/paperless/default.nix @@ -26,7 +26,7 @@ in services.paperless = { enable = true; address = "0.0.0.0"; - dataDir = "/data/nfs/arr-data/documents/paperless"; + dataDir = "/home/finn/documents/paperless"; #inherit (cfg) port extraConfig; port = cfg.port; extraConfig = cfg.extraConfig; diff --git a/modules/environments/zsh/default.nix b/modules/environments/zsh/default.nix index cb1413f..b469db7 100644 --- a/modules/environments/zsh/default.nix +++ b/modules/environments/zsh/default.nix @@ -10,10 +10,15 @@ let }; config = lib.mkIf cfg.enable { - programs.zsh.enable = true; - programs.zsh.ohMyZsh.enable = true; users.defaultUserShell = pkgs.zsh; - } ; + programs.zsh = { + enable = true; + ohMyZsh = { + enable = true; + theme = "agnoster"; + }; + }; + }; } diff --git a/modules/hardware/sound/default.nix b/modules/hardware/sound/default.nix index 50f9e2c..52a6094 100644 --- a/modules/hardware/sound/default.nix +++ b/modules/hardware/sound/default.nix @@ -8,8 +8,7 @@ in }; config = lib.mkIf cfg.enable { - sound.enable = true; - hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = false; hardware.pulseaudio.support32Bit = true; users.extraUsers.finn.extraGroups = [ "audio" ]; };