diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | machines/x/configuration.nix | 16 | ||||
| -rw-r--r-- | machines/x/home.nix | 13 | ||||
| -rw-r--r-- | modules/core/bluetooth.nix | 2 | ||||
| -rw-r--r-- | modules/login.nix | 2 |
5 files changed, 14 insertions, 31 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1709988192, - "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", + "lastModified": 1710164657, + "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", + "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index f3e60e4..a5bad12 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -13,10 +13,8 @@ "core/audio.nix" "core/bluetooth.nix" "core/fonts.nix" - "polkit.nix" "compromyse.nix" "login.nix" - "wm_utils.nix" "virtualization.nix" ]); @@ -30,17 +28,15 @@ services.fstrim.enable = true; - services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - }; - }; - networking.hostName = "x"; home-manager.users.compromyse = import ./home.nix; + services.xserver.desktopManager.plasma6.enable = true; + + environment.plasma5.excludePackages = with pkgs.kdePackages; [ + konsole + oxygen + ]; networking.extraHosts = '' diff --git a/machines/x/home.nix b/machines/x/home.nix index c0ac523..dee6de3 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -21,7 +21,6 @@ in { unzip zip - cinnamon.nemo imv spotify @@ -30,31 +29,19 @@ in { obs-studio - pavucontrol - brightnessctl - pamixer - - wbg wl-clipboard - sway-launcher-desktop - ccls nodePackages.pyright git-lfs ] ++ [ tlauncher ]; imports = (map (path: ../../config/${path}) [ - "themes.nix" "bash.nix" "dotfiles.nix" "git" "nvim" "alacritty" - "dwl.nix" - "way-displays" - "swaylock" - "dunst" ]); home.stateVersion = "23.11"; diff --git a/modules/core/bluetooth.nix b/modules/core/bluetooth.nix index 5e64d97..fbd9b48 100644 --- a/modules/core/bluetooth.nix +++ b/modules/core/bluetooth.nix @@ -3,5 +3,5 @@ { hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; + # services.blueman.enable = true; } diff --git a/modules/login.nix b/modules/login.nix index 79ac35f..67cd6d9 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -10,7 +10,7 @@ enable = true; settings = { default_session = { - command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; + command = "tuigreet --time --remember --cmd \"startplasma-wayland\""; user = "greeter"; }; }; |