From 4c9f67e38806eab9682b758492d972f243e59ba4 Mon Sep 17 00:00:00 2001 From: Tasia Iso Date: Thu, 30 May 2024 20:34:42 +0200 Subject: [PATCH] fix misc config issues --- common/components/de/plasma5.nix | 16 +++++++------ common/components/de/plasma6.nix | 15 ++---------- common/components/de/sddm.nix | 2 -- common/hardware/latest-kernel.nix | 4 ++-- flake.lock | 35 ++++++---------------------- flake.nix | 14 +++++------ home/46d1/home.nix | 2 +- home/tasia-but-old-username/home.nix | 2 +- home/tasia/home.nix | 2 +- home/user/home.nix | 2 +- hosts/new-phoenix/configuration.nix | 2 +- hosts/theseus/configuration.nix | 6 ++--- 12 files changed, 35 insertions(+), 67 deletions(-) diff --git a/common/components/de/plasma5.nix b/common/components/de/plasma5.nix index 4e4edad..9faabf5 100644 --- a/common/components/de/plasma5.nix +++ b/common/components/de/plasma5.nix @@ -1,22 +1,24 @@ -{pkgs, ...}: { +{pkgs, lib, ...}: { imports = [ + ./sddm.nix ./plasma-packages.nix ]; # Enable Xorg/Plasma5 services.xserver = { enable = true; - - displayManager.sddm.enable = true; desktopManager.plasma5.enable = true; }; + services.displayManager = { + defaultSession = "plasma"; + + # Disable Wayland + sddm.wayland.enable = lib.mkForce false; + }; + # Use ksshaskpass to access stored secrets environment.sessionVariables = rec { GIT_ASKPASS = "ksshaskpass"; }; - - programs.kdeconnect = { - enable = false; - }; } diff --git a/common/components/de/plasma6.nix b/common/components/de/plasma6.nix index c73ca5b..f32095d 100644 --- a/common/components/de/plasma6.nix +++ b/common/components/de/plasma6.nix @@ -1,25 +1,14 @@ {pkgs, ...}: { imports = [ + ./sddm.nix ./plasma-packages.nix ]; - services.displayManager = { - sddm = { - enable = true; - wayland.enable = true; - }; - - defaultSession = "plasma"; - }; - + services.displayManager.defaultSession = "plasma"; services.desktopManager.plasma6.enable = true; # Use ksshaskpass to access stored secrets environment.sessionVariables = rec { GIT_ASKPASS = "ksshaskpass"; }; - - programs.kdeconnect = { - enable = false; - }; } diff --git a/common/components/de/sddm.nix b/common/components/de/sddm.nix index 9480317..8b30665 100644 --- a/common/components/de/sddm.nix +++ b/common/components/de/sddm.nix @@ -10,7 +10,5 @@ }; }; }; - - defaultSession = "plasma"; }; } diff --git a/common/hardware/latest-kernel.nix b/common/hardware/latest-kernel.nix index 556dcdc..abc3c67 100644 --- a/common/hardware/latest-kernel.nix +++ b/common/hardware/latest-kernel.nix @@ -1,5 +1,5 @@ -{pkgs, ...}: { +{pkgs, lib, ...}: { boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = lib.mkForce pkgs.linuxPackages_latest; }; } diff --git a/flake.lock b/flake.lock index 750d4df..f9c2739 100644 --- a/flake.lock +++ b/flake.lock @@ -18,22 +18,23 @@ "type": "github" } }, - "home-manager": { + "home-manager-stable": { "inputs": { "nixpkgs": [ - "unstable" + "stable" ] }, "locked": { - "lastModified": 1716930911, - "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -72,10 +73,9 @@ }, "root": { "inputs": { - "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", "nixpkgs": "nixpkgs", "stable": "stable", - "stable-home-manager": "stable-home-manager", "tildefriends": "tildefriends", "unstable": "unstable" } @@ -96,27 +96,6 @@ "type": "github" } }, - "stable-home-manager": { - "inputs": { - "nixpkgs": [ - "stable" - ] - }, - "locked": { - "lastModified": 1716736833, - "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "home-manager", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index d771e19..f21350b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,12 @@ stable.url = "github:nixos/nixpkgs/nixos-24.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "unstable"; - }; + # home-manager = { + # url = "github:nix-community/home-manager"; + # inputs.nixpkgs.follows = "unstable"; + # }; - stable-home-manager = { + home-manager-stable = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "stable"; }; @@ -28,8 +28,8 @@ nixpkgs, stable, unstable, - home-manager, - stable-home-manager, + # home-manager, + home-manager-stable, # nixos-conf-editor, # nix-software-center, tildefriends, diff --git a/home/46d1/home.nix b/home/46d1/home.nix index dbfe688..b48d161 100644 --- a/home/46d1/home.nix +++ b/home/46d1/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.stable-home-manager.nixosModules.home-manager + inputs.home-manager-stable.nixosModules.home-manager ]; users.users.user = { isNormalUser = true; diff --git a/home/tasia-but-old-username/home.nix b/home/tasia-but-old-username/home.nix index 98a0ccd..29fefbd 100644 --- a/home/tasia-but-old-username/home.nix +++ b/home/tasia-but-old-username/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.home-manager.nixosModules.home-manager + inputs.home-manager-stable.nixosModules.home-manager ]; users.users.user = { isNormalUser = true; diff --git a/home/tasia/home.nix b/home/tasia/home.nix index 0c96354..4b1796e 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.stable-home-manager.nixosModules.home-manager + inputs.home-manager-stable.nixosModules.home-manager ]; users.users.tasia = { isNormalUser = true; diff --git a/home/user/home.nix b/home/user/home.nix index e8956fe..38e372f 100644 --- a/home/user/home.nix +++ b/home/user/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.home-manager.nixosModules.home-manager + inputs.home-manager-stable.nixosModules.home-manager ]; users.users.user = { isNormalUser = true; diff --git a/hosts/new-phoenix/configuration.nix b/hosts/new-phoenix/configuration.nix index 7d88042..fd46b8e 100644 --- a/hosts/new-phoenix/configuration.nix +++ b/hosts/new-phoenix/configuration.nix @@ -45,7 +45,7 @@ in { services.syncthing = { dataDir = lib.mkForce "/home/user"; configDir = lib.mkForce "/data/sync/configuration/"; - guiAddess = "0.0.0.0:8384"; + guiAddress = "0.0.0.0:8384"; }; environment.systemPackages = with pkgs; [ diff --git a/hosts/theseus/configuration.nix b/hosts/theseus/configuration.nix index f7a6410..296cf05 100644 --- a/hosts/theseus/configuration.nix +++ b/hosts/theseus/configuration.nix @@ -20,8 +20,8 @@ in { ../../common/hardware/btrfs.nix ../../common/hardware/latest-kernel.nix - ../../common/de/plasma6.nix - # ../../common/de/hyprland.nix + ../../common/components/de/plasma6.nix + # ../../common/components/de/hyprland.nix ../../common/services/syncthing.nix ../../common/services/adguardhome.nix @@ -38,7 +38,7 @@ in { sshKeys.tasia.yaseen ]; - services.btrfs.autoScrub.fileSystems = lb.mkForce ["/" "/data"]; + services.btrfs.autoScrub.fileSystems = lib.mkForce ["/" "/data"]; services.syncthing = { dataDir = lib.mkForce "/home/user/Sync/Phone/";