From 19985c86da4b3cf838622197556d2eae6c60079b Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 14 May 2024 20:38:59 +0200 Subject: [PATCH 1/2] Kde/sddm: enable wayland --- roles/kde/sddm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/kde/sddm.nix b/roles/kde/sddm.nix index 9b7f8c9..4a52489 100644 --- a/roles/kde/sddm.nix +++ b/roles/kde/sddm.nix @@ -45,6 +45,7 @@ in { # Enable SDDM. services.displayManager.sddm = { enable = true; + wayland.enable = true; # theme = "sugar-candy"; settings = { General = {Numlock = "off";}; From 28a3bf2509eda9df8f9e17e218d93972093f27ee Mon Sep 17 00:00:00 2001 From: Toast Date: Sat, 18 May 2024 01:31:40 +0200 Subject: [PATCH 2/2] School: remove most of the role --- roles/school/default.nix | 1 - roles/school/programs/default.nix | 13 ---------- roles/school/programs/helix.nix | 10 -------- roles/school/programs/jetbrains.nix | 19 --------------- roles/school/programs/unity.nix | 8 ------- roles/school/programs/virtualbox.nix | 15 ------------ roles/school/programs/vscode.nix | 23 ------------------ roles/school/services/default.nix | 3 --- roles/school/services/mongodb.nix | 34 -------------------------- roles/school/services/mysql.nix | 36 ---------------------------- roles/school/services/xampp.nix | 34 -------------------------- 11 files changed, 196 deletions(-) delete mode 100644 roles/school/programs/default.nix delete mode 100644 roles/school/programs/helix.nix delete mode 100644 roles/school/programs/jetbrains.nix delete mode 100644 roles/school/programs/unity.nix delete mode 100644 roles/school/programs/virtualbox.nix delete mode 100644 roles/school/programs/vscode.nix delete mode 100644 roles/school/services/mongodb.nix delete mode 100644 roles/school/services/mysql.nix delete mode 100644 roles/school/services/xampp.nix diff --git a/roles/school/default.nix b/roles/school/default.nix index 515d2d6..dc31263 100644 --- a/roles/school/default.nix +++ b/roles/school/default.nix @@ -1,6 +1,5 @@ {...}: { imports = [ ./services - ./programs ]; } diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix deleted file mode 100644 index 24452c0..0000000 --- a/roles/school/programs/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{pkgs, ...}: { - imports = [ - ./virtualbox.nix - ./jetbrains.nix - ./vscode.nix - ./helix.nix - ./unity.nix - ]; - - environment.systemPackages = with pkgs; [ - dia - ]; -} diff --git a/roles/school/programs/helix.nix b/roles/school/programs/helix.nix deleted file mode 100644 index e16ddf0..0000000 --- a/roles/school/programs/helix.nix +++ /dev/null @@ -1,10 +0,0 @@ -{pkgs, ...}: { - home-manager.users.toast = { - programs.helix = { - extraPackages = with pkgs; [ - nodePackages.typescript-language-server - omnisharp-roslyn - ]; - }; - }; -} diff --git a/roles/school/programs/jetbrains.nix b/roles/school/programs/jetbrains.nix deleted file mode 100644 index 57fe938..0000000 --- a/roles/school/programs/jetbrains.nix +++ /dev/null @@ -1,19 +0,0 @@ -{pkgs, ...}: -with pkgs; { - environment.systemPackages = with jetbrains; [ - idea-ultimate - scenebuilder - datagrip - ]; - - home-manager.users.toast = { - /* - If you use programs.java.enable intellij picks up the jdk package directly, which is not ideal - This adds the jdks I want to use to a directory intellij expects jdks to be - */ - home.file.".jdks/jdk8".source = "${pkgs.jdk8}/lib/openjdk"; - home.file.".jdks/jdk17".source = let - jdk17 = pkgs.jdk17.override {enableJavaFX = true;}; - in "${jdk17}/lib/openjdk"; - }; -} diff --git a/roles/school/programs/unity.nix b/roles/school/programs/unity.nix deleted file mode 100644 index b30daf4..0000000 --- a/roles/school/programs/unity.nix +++ /dev/null @@ -1,8 +0,0 @@ -{pkgs, ...}: { - home-manager.users.toast = { - home.packages = with pkgs; [ - unityhub - jetbrains.rider - ]; - }; -} diff --git a/roles/school/programs/virtualbox.nix b/roles/school/programs/virtualbox.nix deleted file mode 100644 index 58e7ff1..0000000 --- a/roles/school/programs/virtualbox.nix +++ /dev/null @@ -1,15 +0,0 @@ -{...}: { - # Need to use visual studio 2019 :( - virtualisation.virtualbox.host = { - enable = true; - }; - home-manager.sharedModules = [ - { - systemd.user.tmpfiles.rules = [ - "d '/%h/VirtualBox VMs'" - "h '/%h/VirtualBox VMs' - - - - C " - ]; - } - ]; - users.users.toast.extraGroups = ["vboxusers"]; -} diff --git a/roles/school/programs/vscode.nix b/roles/school/programs/vscode.nix deleted file mode 100644 index e39e633..0000000 --- a/roles/school/programs/vscode.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - pkgs, - lib, - flakeSelf, - ... -}: let - inputs = flakeSelf.inputs; -in { - home-manager.users.toast.programs.vscode = { - # The redhat xml extension needs an fhs environment - package = lib.mkForce pkgs.vscodium-fhs; - extensions = with inputs.vscode-extensions.extensions.x86_64-linux; [ - open-vsx.redhat.vscode-xml - open-vsx.tomoki1207.pdf - open-vsx.ms-vscode.live-server - open-vsx.ecmel.vscode-html-css - open-vsx.angular.ng-template - ]; - userSettings = { - redhat.telemetry.enabled = false; - }; - }; -} diff --git a/roles/school/services/default.nix b/roles/school/services/default.nix index 350d7bd..24b067d 100644 --- a/roles/school/services/default.nix +++ b/roles/school/services/default.nix @@ -1,8 +1,5 @@ {...}: { imports = [ ./syncthing.nix - ./mysql.nix - ./xampp.nix - ./mongodb.nix ]; } diff --git a/roles/school/services/mongodb.nix b/roles/school/services/mongodb.nix deleted file mode 100644 index 42c12fc..0000000 --- a/roles/school/services/mongodb.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - services.mongodb = { - enable = true; - package = pkgs.mongodb-5_0; - user = "toast"; - }; - - # Don't autostart MySQL - systemd.services.mongodb.wantedBy = lib.mkForce []; - - # Allow regular users to start/stop mongodb - # https://stackoverflow.com/questions/61480914/using-policykit-to-allow-non-root-users-to-start-and-stop-a-service - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if ( - action.id == "org.freedesktop.systemd1.manage-units" && - action.lookup("unit") == "mongodb.service" && - subject.user == "${config.services.mongodb.user}" - ) - { - return polkit.Result.YES; - } - }) - ''; - - environment.systemPackages = with pkgs; [ - mongosh - ]; -} diff --git a/roles/school/services/mysql.nix b/roles/school/services/mysql.nix deleted file mode 100644 index fbbd3f9..0000000 --- a/roles/school/services/mysql.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - services.mysql = { - enable = true; - package = pkgs.mysql80; - user = "toast"; - group = "users"; - }; - - # Don't autostart MySQL - systemd.services.mysql.wantedBy = lib.mkForce []; - - # Allow regular users to start/stop mysql - # https://stackoverflow.com/questions/61480914/using-policykit-to-allow-non-root-users-to-start-and-stop-a-service - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if ( - action.id == "org.freedesktop.systemd1.manage-units" && - action.lookup("unit") == "mysql.service" && - subject.user == "${config.services.mysql.user}" - ) - { - return polkit.Result.YES; - } - }) - ''; - - environment.systemPackages = with pkgs; [ - mysql-workbench - mycli - ]; -} diff --git a/roles/school/services/xampp.nix b/roles/school/services/xampp.nix deleted file mode 100644 index 26ee73b..0000000 --- a/roles/school/services/xampp.nix +++ /dev/null @@ -1,34 +0,0 @@ -{pkgs, ...}: let - booDark = pkgs.fetchzip { - url = "https://github.com/adorade/boodark/releases/download/v1.1.1/boodark-v1.1.1.zip"; - hash = "sha256-GE/FtFlU6A4I9sRyjMhQIidGpDLD99Wzzngz3QI/rSo="; - }; -in { - # I tried setting up httpd + php in class but I just gave up - virtualisation.oci-containers = { - containers."xampp" = { - autoStart = false; - image = "tomsik68/xampp"; - #user = "${toString users.users.atfc.uid}:${toString users.groups.minecraft.gid}"; - volumes = [ - "xampp-mysql:/opt/lampp/var/mysql" - # No dark mode installed by default :( - "${booDark}:/opt/lampp/phpmyadmin/themes/booDark" - ]; - ports = ["41061:22" "41062:80"]; - }; - }; - - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if ( - action.id == "org.freedesktop.systemd1.manage-units" && - action.lookup("unit") == "podman-xampp.service" && - subject.user == "toast" - ) - { - return polkit.Result.YES; - } - }) - ''; -}