diff --git a/nix/home/opdavies/desktop/default.nix b/nix/home/opdavies/desktop/default.nix
index 66f32ba3..a2f9eed8 100644
--- a/nix/home/opdavies/desktop/default.nix
+++ b/nix/home/opdavies/desktop/default.nix
@@ -3,15 +3,12 @@
{
imports = [
./firefox.nix
- ./qutebrowser.nix
];
home.packages = with pkgs; [
build-glove80
- gscan2pdf
kdePackages.okular
meslo-lg
- obs-studio
pamixer
pavucontrol
xcape
diff --git a/nix/home/opdavies/hosts/t490.nix b/nix/home/opdavies/hosts/t490.nix
index 7cea500f..979f02ec 100644
--- a/nix/home/opdavies/hosts/t490.nix
+++ b/nix/home/opdavies/hosts/t490.nix
@@ -1,41 +1,12 @@
-{ pkgs, ... }:
-
{
homeManagerModules = {
bluetuith.enable = true;
brave.enable = true;
- direnv.enable = true;
- discord.enable = true;
- dwm.enable = true;
- flameshot.enable = true;
- gimp.enable = true;
gtk.enable = true;
- handbrake.enable = true;
- kdenlive.enable = true;
mpv.enable = true;
neovim.enable = true;
-
- notes = {
- enable = true;
- directory = "$HOME/Documents/wiki/notes";
- };
-
- pocket-casts.enable = true;
slack.enable = true;
tmux.enable = true;
tmux-sessionizer.enable = true;
- zoom.enable = true;
- };
-
- home.packages = with pkgs; [
- displayselect
- isync
- upload-to-files
- ];
-
- programs.neomutt = {
- enable = true;
-
- vimKeys = true;
};
}
diff --git a/nix/hosts/lemp11/configuration.nix b/nix/hosts/lemp11/configuration.nix
index 616b8a19..4cb65941 100644
--- a/nix/hosts/lemp11/configuration.nix
+++ b/nix/hosts/lemp11/configuration.nix
@@ -19,6 +19,10 @@
../../users/luke
];
+ nixosModules = {
+ cinnamon.enable = true;
+ };
+
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
# Bootloader.
diff --git a/nix/hosts/lemp11/services.nix b/nix/hosts/lemp11/services.nix
index 0d5dae7a..f81fbd4e 100644
--- a/nix/hosts/lemp11/services.nix
+++ b/nix/hosts/lemp11/services.nix
@@ -35,9 +35,6 @@
layout = "gb";
variant = "";
};
-
- desktopManager.cinnamon.enable = true;
- displayManager.lightdm.enable = true;
};
};
}
diff --git a/nix/hosts/t490/configuration.nix b/nix/hosts/t490/configuration.nix
index be333157..c6ed050e 100644
--- a/nix/hosts/t490/configuration.nix
+++ b/nix/hosts/t490/configuration.nix
@@ -7,21 +7,15 @@
./programs.nix
./secrets.nix
./services
- ./users.nix
-
- ./modules/docker.nix
../common
+ ../../users/luke
../../users/opdavies
];
nixosModules = {
- dwm.enable = true;
- gaming.enable = true;
- redshift.enable = true;
- st.enable = true;
+ cinnamon.enable = true;
thunar.enable = true;
- peek.enable = true;
};
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
@@ -51,18 +45,8 @@
};
environment.systemPackages = with pkgs; [
- gtypist
pam_gnupg
- rclone
- rclone-browser
- sxiv
- ttyper
- yt-dlp
];
zramSwap.enable = true;
-
- networking.hosts = {
- "192.168.1.116" = [ "nixedo" ];
- };
}
diff --git a/nix/hosts/t490/services/cron.nix b/nix/hosts/t490/services/cron.nix
deleted file mode 100644
index f9b961c3..00000000
--- a/nix/hosts/t490/services/cron.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
- services.cron = {
- enable = true;
-
- systemCronJobs = [
- "*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Code/email-filters/config.lua"
- "0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a"
- ];
- };
-}
diff --git a/nix/hosts/t490/services/default.nix b/nix/hosts/t490/services/default.nix
index ef7c3c7b..2ad8feec 100644
--- a/nix/hosts/t490/services/default.nix
+++ b/nix/hosts/t490/services/default.nix
@@ -1,8 +1,5 @@
{
imports = [
- ./cron.nix
- ./interception-tools.nix
- ./redshift.nix
./sound.nix
./udev.nix
./xserver.nix
diff --git a/nix/hosts/t490/services/interception-tools.nix b/nix/hosts/t490/services/interception-tools.nix
deleted file mode 100644
index 96e43b85..00000000
--- a/nix/hosts/t490/services/interception-tools.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
- # Make Caps lock work as an Escape key on press and Ctrl on hold.
- services.interception-tools =
- let
- dfkConfig = pkgs.writeText "dual-function-keys.yaml" ''
- MAPPINGS:
- - KEY: KEY_CAPSLOCK
- TAP: KEY_ESC
- HOLD: KEY_LEFTCTRL
- '';
- in
- {
- enable = true;
- plugins = pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
- udevmonConfig = ''
- - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
- DEVICE:
- NAME: "AT Translated Set 2 keyboard"
- EVENTS:
- EV_KEY: [[KEY_CAPSLOCK, KEY_ESC, KEY_LEFTCTRL]]
- '';
- };
-}
diff --git a/nix/hosts/t490/services/redshift.nix b/nix/hosts/t490/services/redshift.nix
deleted file mode 100644
index 3fcfdf4f..00000000
--- a/nix/hosts/t490/services/redshift.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
- cfg = config.nixosModules.redshift;
-in
-{
- options.nixosModules.redshift.enable = mkEnableOption "Enable redshift";
-
- config = mkIf cfg.enable {
- location = {
- latitude = 51.48;
- longitude = -3.17;
- };
-
- services.redshift = {
- enable = true;
-
- brightness = {
- day = "1";
- night = "1";
- };
-
- temperature = {
- day = 5500;
- night = 3700;
- };
- };
- };
-}
diff --git a/nix/hosts/t490/users.nix b/nix/hosts/t490/users.nix
deleted file mode 100644
index f663ad5c..00000000
--- a/nix/hosts/t490/users.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, username, ... }:
-
-{
- users.users.${username} = {
- extraGroups = [ "media" ];
-
- packages = with pkgs; [
- abook
- android-tools
- via
- ];
- };
-
- users.groups.media = { };
-}
diff --git a/nix/modules/nixos/desktop/cinnamon.nix b/nix/modules/nixos/desktop/cinnamon.nix
new file mode 100644
index 00000000..f0a62518
--- /dev/null
+++ b/nix/modules/nixos/desktop/cinnamon.nix
@@ -0,0 +1,16 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+ options.nixosModules.cinnamon.enable = mkEnableOption "Enable cinnamon";
+
+ config = mkIf config.nixosModules.cinnamon.enable {
+ services.xserver = {
+ enable = true;
+
+ desktopManager.cinnamon.enable = true;
+ displayManager.lightdm.enable = true;
+ };
+ };
+}
diff --git a/nix/modules/nixos/desktop/default.nix b/nix/modules/nixos/desktop/default.nix
index 154389c4..53906edf 100644
--- a/nix/modules/nixos/desktop/default.nix
+++ b/nix/modules/nixos/desktop/default.nix
@@ -1,5 +1,6 @@
{
imports = [
+ ./cinnamon.nix
./dwm.nix
./peek.nix
./screenkey.nix
diff --git a/nix/users/luke/default.nix b/nix/users/luke/default.nix
index fb413562..9cc9dcc6 100644
--- a/nix/users/luke/default.nix
+++ b/nix/users/luke/default.nix
@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
let
username = "luke";
in
@@ -7,6 +9,6 @@ in
extraGroups = [ ];
initialPassword = username;
isNormalUser = true;
- packages = [ ];
+ packages = with pkgs; [ librewolf ];
};
}