diff --git a/configurations/nixos/vixen/configuration.nix b/configurations/nixos/vixen/configuration.nix index 2c43234..eeaa42d 100644 --- a/configurations/nixos/vixen/configuration.nix +++ b/configurations/nixos/vixen/configuration.nix @@ -43,41 +43,9 @@ LC_TIME = "en_US.UTF-8"; }; - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; - # Enable CUPS to print documents. services.printing.enable = true; - # Enable sound with pipewire. - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.srid = { isNormalUser = true; @@ -88,8 +56,6 @@ ]; }; - # Install firefox. - programs.firefox.enable = true; # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix index 58bd70f..9d4bcea 100644 --- a/configurations/nixos/vixen/default.nix +++ b/configurations/nixos/vixen/default.nix @@ -8,19 +8,10 @@ in imports = [ self.nixosModules.default inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen4 - (self + /modules/nixos/linux/gui/_1password.nix) - (self + /modules/nixos/linux/gui/steam.nix) - (self + /modules/nixos/linux/gui/desktopish/monitor-brightness.nix) ./configuration.nix ]; boot.initrd.kernelModules = [ "amdgpu" ]; - services.xserver.videoDrivers = [ "amdgpu" ]; services.tailscale.enable = true; - environment.systemPackages = with pkgs; [ - google-chrome - zed-editor - calibre - ]; } diff --git a/flake.lock b/flake.lock index 70165c1..9a3f0e3 100644 --- a/flake.lock +++ b/flake.lock @@ -21,39 +21,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1731959031, - "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "cachix-push": { "locked": { "lastModified": 1725315090, @@ -74,7 +41,7 @@ "devshell": "devshell", "flake-parts": "flake-parts_5", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" }, @@ -257,22 +224,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -396,7 +347,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -414,7 +365,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -432,7 +383,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -528,28 +479,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "vira", @@ -676,227 +605,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734906236, - "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1734636407, - "narHash": "sha256-HF5shWnOv5uJJSKJnnbLvE+lqCTCTKY2JlKs14kVKOo=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "0bd541f2fd902dbfa04c3ea2ccf679395e316887", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "ref": "v0.46.2", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734906472, - "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "inspect": { "flake": false, "locked": { @@ -969,7 +677,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1754815323, @@ -1113,7 +821,7 @@ "nixos-vscode-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1684517665, @@ -1172,22 +880,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1744868846, @@ -1205,22 +897,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1233,7 +909,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1755027561, "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", @@ -1249,7 +925,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -1263,7 +939,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -1279,7 +955,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1755577059, "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=", @@ -1295,7 +971,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1738264807, "narHash": "sha256-6x6WLFwoLdR3w3FYtCnLye2Xe32SqsL7Zf0jpa5wJMM=", @@ -1311,7 +987,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1748217807, "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", @@ -1334,7 +1010,7 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1755095763, @@ -1352,7 +1028,7 @@ }, "nuenv": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay" }, "locked": { @@ -1405,9 +1081,9 @@ "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "rust-flake": "rust-flake", - "systems": "systems_8", + "systems": "systems_7", "true": "true" }, "locked": { @@ -1424,34 +1100,10 @@ "type": "github" } }, - "pre-commit-hooks": { + "pre-commit-hooks-nix": { "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", "nixpkgs": [ "vira", "co-log-effectful", @@ -1495,14 +1147,13 @@ "git-hooks": "git-hooks", "github-nix-ci": "github-nix-ci", "home-manager": "home-manager_2", - "hyprland": "hyprland", "nix-darwin": "nix-darwin", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixos-unified": "nixos-unified", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nuenv": "nuenv", @@ -1596,16 +1247,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1684,21 +1335,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1739,7 +1375,7 @@ "try": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1755714246, @@ -1789,7 +1425,7 @@ "htmx": "htmx", "htmx-extensions": "htmx-extensions", "nixos-unified": "nixos-unified_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "process-compose-flake": "process-compose-flake" }, "locked": { @@ -1805,47 +1441,6 @@ "repo": "vira", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index caa4cb8..b621fba 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,6 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; omnix.url = "github:juspay/omnix"; - hyprland.url = "github:hyprwm/Hyprland/v0.46.2"; vertex.url = "github:juspay/vertex"; vertex.inputs = { nixpkgs.follows = "nixpkgs"; diff --git a/modules/nixos/linux/email/default.nix b/modules/nixos/linux/email/default.nix deleted file mode 100644 index 98f4272..0000000 --- a/modules/nixos/linux/email/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./protonmail-bridge.nix - ]; -} diff --git a/modules/nixos/linux/email/protonmail-bridge.nix b/modules/nixos/linux/email/protonmail-bridge.nix deleted file mode 100644 index ca5176b..0000000 --- a/modules/nixos/linux/email/protonmail-bridge.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = [ pkgs.protonmail-bridge ]; - services.gnome.gnome-keyring.enable = true; - - # Before starting the service, use `protonmail-bridge --cli` and run 'login' - # to configure. - systemd.user.services.protonmail-bridge = { - description = "Protonmail Bridge"; - after = [ "network.target" ]; - wantedBy = [ "default.target" ]; - path = [ pkgs.pass ]; - serviceConfig = { - Restart = "always"; - ExecStart = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive"; - }; - }; -} diff --git a/modules/nixos/linux/gui/_1password.nix b/modules/nixos/linux/gui/_1password.nix deleted file mode 100644 index a3c89a0..0000000 --- a/modules/nixos/linux/gui/_1password.nix +++ /dev/null @@ -1,11 +0,0 @@ -# https://nixos.wiki/wiki/1Password -{ - programs._1password.enable = true; - programs._1password-gui = { - enable = true; - # Certain features, including CLI integration and system authentication support, - # require enabling PolKit integration on some desktop environments (e.g. Plasma). - polkitPolicyOwners = [ "srid" ]; - }; - security.polkit.enable = true; -} diff --git a/modules/nixos/linux/gui/desktopish/README.md b/modules/nixos/linux/gui/desktopish/README.md deleted file mode 100644 index 8a14163..0000000 --- a/modules/nixos/linux/gui/desktopish/README.md +++ /dev/null @@ -1 +0,0 @@ -Individual features to be added to tiling window managers and such as to provide a desktop-like experience. diff --git a/modules/nixos/linux/gui/desktopish/autolock.nix b/modules/nixos/linux/gui/desktopish/autolock.nix deleted file mode 100644 index 864f89d..0000000 --- a/modules/nixos/linux/gui/desktopish/autolock.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, pkgs, ... }: -let - caffeine = - pkgs.writeScriptBin "caffeine" - '' - #!${pkgs.runtimeShell} - set -xe - HOURS=$* - SECS=`expr 1 + 60 \* 60 \* $HOURS` - date - ${pkgs.xautolock}/bin/xautolock -disable - ${pkgs.cowsay}/bin/cowsay "Autolock de-activated for next $HOURS hours" - sleep $SECS - date - ${pkgs.xautolock}/bin/xautolock -enable - ${pkgs.cowsay}/bin/cowsay "Autolock re-activated." - ''; -in -{ - services.xserver.xautolock = { - enable = true; - time = 5; # mins - - # Some modes freeze P71, so explicitly select a mode that is known to be stable. - locker = "${pkgs.xlockmore}/bin/xlock -mode space"; - - # Suspend after lock. - killtime = 10; # mins - killer = "${pkgs.systemd}/bin/systemctl suspend"; - }; - - environment.systemPackages = [ - # TODO: replace this with https://github.com/jD91mZM2/xidlehook - # - # A script to disable auto-suspend until unlocking the computer the next - # time. The idea is to leave this running on desktop, whilst taking my - # laptop to another room and ssh to the desktop. - (pkgs.writeScriptBin "estivate" - '' - #!${pkgs.runtimeShell} - set -xe - date - ${pkgs.xautolock}/bin/xautolock -disable - ${pkgs.xlockmore}/bin/xlock -mode blank - date - ${pkgs.xautolock}/bin/xautolock -enable - ${pkgs.cowsay}/bin/cowsay "Welcome back!" - '') - # Run this before watching a movie - (pkgs.writeScriptBin "caffeine-2hr" - '' - #!${pkgs.runtimeShell} - set -xe - ${caffeine} 2 - '') - caffeine - ]; -} diff --git a/modules/nixos/linux/gui/desktopish/default.nix b/modules/nixos/linux/gui/desktopish/default.nix deleted file mode 100644 index e61d1f5..0000000 --- a/modules/nixos/linux/gui/desktopish/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ pkgs, ... }: { - imports = [ - # Isolated features - ./hidpi.nix - ./swap-caps-ctrl.nix - ./light-terminal.nix - ./screencapture.nix - ./fonts.nix - ./touchpad-trackpoint.nix - ./autolock.nix - ./redshift.nix - ./gnome-keyring.nix - ./guiapps.nix - ./polybar.nix - ./hotplug.nix - - # WMish things - ./xmonad - #./taffybar # Disabled, because it rarely works (and memory hungry) - # ./xmobar # shit UX - ]; - - environment.systemPackages = with pkgs; [ - acpi - mpv - youtube-dl - xorg.xmessage - ]; - - services.xserver = { - enable = true; - displayManager.lightdm.enable = true; - }; - - # Speed up boot - # https://discourse.nixos.org/t/boot-faster-by-disabling-udev-settle-and-nm-wait-online/6339 - systemd.services.systemd-udev-settle.enable = false; - systemd.services.NetworkManager-wait-online.enable = false; - -} diff --git a/modules/nixos/linux/gui/desktopish/fonts.nix b/modules/nixos/linux/gui/desktopish/fonts.nix deleted file mode 100644 index ae1cc5d..0000000 --- a/modules/nixos/linux/gui/desktopish/fonts.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: - -{ - fonts = { - enableDefaultPackages = true; - - packages = with pkgs; [ - # NOTE: Some fonts may break colour emojis in Chrome - # cf. https://github.com/NixOS/nixpkgs/issues/69073#issuecomment-621982371 - # If this happens , keep noto-fonts-emoji and try disabling others (nerdfonts, etc.) - noto-fonts-emoji - fira-code - font-awesome - ]; - }; -} diff --git a/modules/nixos/linux/gui/desktopish/gnome-keyring.nix b/modules/nixos/linux/gui/desktopish/gnome-keyring.nix deleted file mode 100644 index 7b8af86..0000000 --- a/modules/nixos/linux/gui/desktopish/gnome-keyring.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: { - services.gnome.at-spi2-core.enable = true; # Not sure what this is for. - - # https://unix.stackexchange.com/a/434752 - security.pam.services.lightdm.enableGnomeKeyring = true; - services.gnome.gnome-keyring.enable = true; - programs.seahorse.enable = true; # keyring GUI -} diff --git a/modules/nixos/linux/gui/desktopish/guiapps.nix b/modules/nixos/linux/gui/desktopish/guiapps.nix deleted file mode 100644 index 0dae035..0000000 --- a/modules/nixos/linux/gui/desktopish/guiapps.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./vscode.nix - ]; - - # Apps I use on desktops and laptops - environment.systemPackages = with pkgs; [ - firefox - # onlyoffice-bin - obsidian - - simplescreenrecorder - obs-studio - - vlc - qbittorrent - - # X stuff - caffeine-ng - xorg.xdpyinfo - xorg.xrandr - xclip - xsel - arandr - ]; -} diff --git a/modules/nixos/linux/gui/desktopish/hidpi.nix b/modules/nixos/linux/gui/desktopish/hidpi.nix deleted file mode 100644 index 061f6d7..0000000 --- a/modules/nixos/linux/gui/desktopish/hidpi.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - hardware.video.hidpi.enable = true; - services.xserver.dpi = 170; - services.xserver.displayManager.sessionCommands = '' - ${pkgs.xorg.xrdb}/bin/xrdb -merge < -index-sort = true -wrapping-scroll = false - -; Only show workspaces on the same output as the bar -;pin-workspaces = true - -label-mode-padding = 2 -label-mode-foreground = #000 -label-mode-background = ${colors.primary} - -; focused = Active workspace on focused monitor -label-focused = %index% -label-focused-background = ${colors.background-alt} -label-focused-underline= ${colors.primary} -label-focused-padding = 2 - -; unfocused = Inactive workspace on any monitor -label-unfocused = %index% -label-unfocused-padding = 2 - -; visible = Active workspace on unfocused monitor -label-visible = %index% -label-visible-background = ${self.label-focused-background} -label-visible-underline = ${self.label-focused-underline} -label-visible-padding = ${self.label-focused-padding} - -; urgent = Workspace with urgency hint set -label-urgent = %index% -label-urgent-background = ${colors.alert} -label-urgent-padding = 2 - -; Separator in between workspaces -; label-separator = | - - -[module/mpd] -type = internal/mpd -format-online = - -icon-prev =  -icon-stop =  -icon-play =  -icon-pause =  -icon-next =  - -label-song-maxlen = 25 -label-song-ellipsis = true - -[module/xbacklight] -type = internal/xbacklight - -format =