From 74b64ab6f119c470b69a8b0e6ec598e009a075c2 Mon Sep 17 00:00:00 2001 From: muon Date: Fri, 24 May 2024 20:30:18 +0000 Subject: [PATCH] Add lingering changes --- flake.lock | 591 +-------------------------------- flake.nix | 4 +- modules/core/display.nix | 14 +- modules/core/network.nix | 11 +- modules/core/nix.nix | 4 +- modules/home/default.nix | 4 +- modules/home/helix/default.nix | 13 +- modules/home/packages.nix | 9 +- modules/home/theme/default.nix | 9 +- modules/home/tools/default.nix | 24 +- modules/unfree/nvidia.nix | 7 +- 11 files changed, 74 insertions(+), 616 deletions(-) diff --git a/flake.lock b/flake.lock index a85305c..f89fa80 100644 --- a/flake.lock +++ b/flake.lock @@ -21,168 +21,6 @@ "type": "github" } }, - "doom-emacs": { - "flake": false, - "locked": { - "lastModified": 1662497747, - "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", - "type": "github" - } - }, - "doom-snippets": { - "flake": false, - "locked": { - "lastModified": 1676839496, - "narHash": "sha256-1Ay9zi0u1lycmEeFqIxr0RWH+JvH9BnzgRzkPeWEAYY=", - "owner": "doomemacs", - "repo": "snippets", - "rev": "fe4003014ae00b866f117cb193f711fd9d72fd11", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "snippets", - "type": "github" - } - }, - "emacs-overlay": { - "flake": false, - "locked": { - "lastModified": 1676366521, - "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", - "type": "github" - } - }, - "emacs-so-long": { - "flake": false, - "locked": { - "lastModified": 1575031854, - "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", - "owner": "hlissner", - "repo": "emacs-so-long", - "rev": "ed666b0716f60e8988c455804de24b55919e71ca", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "emacs-so-long", - "type": "github" - } - }, - "evil-collection": { - "flake": false, - "locked": { - "lastModified": 1686801899, - "narHash": "sha256-wGJWF9t8yaxLyYQRf3hK+5/AIYYAS8qWXPDEvatzBlc=", - "owner": "emacs-evil", - "repo": "evil-collection", - "rev": "4a7d924dbd851ef1b2ccb85778be6e7a6a81ebd4", - "type": "github" - }, - "original": { - "owner": "emacs-evil", - "repo": "evil-collection", - "type": "github" - } - }, - "evil-escape": { - "flake": false, - "locked": { - "lastModified": 1588439096, - "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=", - "owner": "hlissner", - "repo": "evil-escape", - "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-escape", - "type": "github" - } - }, - "evil-markdown": { - "flake": false, - "locked": { - "lastModified": 1626852210, - "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", - "owner": "Somelauw", - "repo": "evil-markdown", - "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", - "type": "github" - }, - "original": { - "owner": "Somelauw", - "repo": "evil-markdown", - "type": "github" - } - }, - "evil-org-mode": { - "flake": false, - "locked": { - "lastModified": 1607203864, - "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", - "owner": "hlissner", - "repo": "evil-org-mode", - "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-org-mode", - "type": "github" - } - }, - "evil-quick-diff": { - "flake": false, - "locked": { - "lastModified": 1575189609, - "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", - "type": "github" - }, - "original": { - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "type": "github" - } - }, - "explain-pause-mode": { - "flake": false, - "locked": { - "lastModified": 1595842060, - "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", - "owner": "lastquestion", - "repo": "explain-pause-mode", - "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", - "type": "github" - }, - "original": { - "owner": "lastquestion", - "repo": "explain-pause-mode", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -199,22 +37,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -233,41 +55,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "format-all": { - "flake": false, - "locked": { - "lastModified": 1581716637, - "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - }, - "original": { - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -310,139 +97,7 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1688466862, - "narHash": "sha256-Ll5jaJeju1aW4mvIC/5UIgMfHukUjiVznGV3kJCwBhY=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "07d7962c7f56c9928e494e4401806726d7ac5b05", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "nix-doom-emacs": { - "inputs": { - "doom-emacs": "doom-emacs", - "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", - "emacs-so-long": "emacs-so-long", - "evil-collection": "evil-collection", - "evil-escape": "evil-escape", - "evil-markdown": "evil-markdown", - "evil-org-mode": "evil-org-mode", - "evil-quick-diff": "evil-quick-diff", - "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "format-all": "format-all", - "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_2", - "nose": "nose", - "ob-racket": "ob-racket", - "org": "org", - "org-contrib": "org-contrib", - "org-yt": "org-yt", - "php-extras": "php-extras", - "revealjs": "revealjs", - "rotate-text": "rotate-text", - "sln-mode": "sln-mode", - "ts-fold": "ts-fold", - "ws-butler": "ws-butler" - }, - "locked": { - "lastModified": 1686959076, - "narHash": "sha256-tzwHJ8q9CMpIwxcyCM51i88arntNMARi1mFkAppMgqk=", - "owner": "nix-community", - "repo": "nix-doom-emacs", - "rev": "2c4ba0d77fdfa4495929c8aee814936e722715c5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-doom-emacs", - "type": "github" - } - }, - "nix-straight": { - "flake": false, - "locked": { - "lastModified": 1666982610, - "narHash": "sha256-xjgIrmUsekVTE+MpZb5DMU8DQf9DJ/ZiR0o30L9/XCc=", - "owner": "nix-community", - "repo": "nix-straight.el", - "rev": "ad10364d64f472c904115fd38d194efe1c3f1226", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-straight.el", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1687502512, - "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1682566018, - "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1687898314, "narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=", @@ -458,7 +113,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_2": { "locked": { "lastModified": 1679793451, "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", @@ -474,147 +129,17 @@ "type": "github" } }, - "nose": { - "flake": false, - "locked": { - "lastModified": 1400604510, - "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", - "owner": "emacsattic", - "repo": "nose", - "rev": "f8528297519eba911696c4e68fa88892de9a7b72", - "type": "github" - }, - "original": { - "owner": "emacsattic", - "repo": "nose", - "type": "github" - } - }, - "ob-racket": { - "flake": false, - "locked": { - "lastModified": 1584656173, - "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", - "owner": "xchrishawk", - "repo": "ob-racket", - "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", - "type": "github" - }, - "original": { - "owner": "xchrishawk", - "repo": "ob-racket", - "type": "github" - } - }, - "org": { - "flake": false, - "locked": { - "lastModified": 1683136293, - "narHash": "sha256-PMHNr3Qo62uqO5IUDAfxUoqa4Zvb9y2J76pRYDB/6Y4=", - "owner": "emacs-straight", - "repo": "org-mode", - "rev": "080710797ad25e76c4556d2b03cc0aa5313cd187", - "type": "github" - }, - "original": { - "owner": "emacs-straight", - "repo": "org-mode", - "type": "github" - } - }, - "org-contrib": { - "flake": false, - "locked": { - "lastModified": 1675694242, - "narHash": "sha256-4Fn33CTVTCqh5TyVAggSr8Fm8/hB8Xgl+hkxh3WCrI8=", - "owner": "emacsmirror", - "repo": "org-contrib", - "rev": "fff6c888065588527b1c1d7dd7e41c29ef767e17", - "type": "github" - }, - "original": { - "owner": "emacsmirror", - "repo": "org-contrib", - "type": "github" - } - }, - "org-yt": { - "flake": false, - "locked": { - "lastModified": 1527381913, - "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", - "owner": "TobiasZawada", - "repo": "org-yt", - "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", - "type": "github" - }, - "original": { - "owner": "TobiasZawada", - "repo": "org-yt", - "type": "github" - } - }, - "php-extras": { - "flake": false, - "locked": { - "lastModified": 1573312690, - "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", - "owner": "arnested", - "repo": "php-extras", - "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", - "type": "github" - }, - "original": { - "owner": "arnested", - "repo": "php-extras", - "type": "github" - } - }, - "revealjs": { - "flake": false, - "locked": { - "lastModified": 1681386605, - "narHash": "sha256-9Q7aWgjAV37iJp6oYDz45e8J+RKwKY1Uvgg/BXwf5nQ=", - "owner": "hakimel", - "repo": "reveal.js", - "rev": "0301ce58ab185f7191696e16b1b6389f58df2892", - "type": "github" - }, - "original": { - "owner": "hakimel", - "repo": "reveal.js", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", - "nix-doom-emacs": "nix-doom-emacs", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay", "stylix": "stylix" } }, - "rotate-text": { - "flake": false, - "locked": { - "lastModified": 1322962747, - "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", - "owner": "debug-ito", - "repo": "rotate-text.el", - "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", - "type": "github" - }, - "original": { - "owner": "debug-ito", - "repo": "rotate-text.el", - "type": "github" - } - }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -633,28 +158,12 @@ "type": "github" } }, - "sln-mode": { - "flake": false, - "locked": { - "lastModified": 1423727528, - "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=", - "owner": "sensorflo", - "repo": "sln-mode", - "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c", - "type": "github" - }, - "original": { - "owner": "sensorflo", - "repo": "sln-mode", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1688308288, @@ -685,37 +194,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "ts-fold": { - "flake": false, - "locked": { - "lastModified": 1681029086, - "narHash": "sha256-z3eVkAPFI6JYZZ+2XM496zBxwnujTp4Y4KNNfqgUC/E=", - "owner": "jcs-elpa", - "repo": "ts-fold", - "rev": "5fd2a5afe2112ac23b58ee1b12730fcf16068df3", - "type": "github" - }, - "original": { - "owner": "jcs-elpa", - "repo": "ts-fold", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1676283394, @@ -730,65 +208,6 @@ "repo": "flake-utils", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1686753331, - "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "type": "gitlab" - } - }, - "ws-butler": { - "flake": false, - "locked": { - "lastModified": 1634511126, - "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=", - "owner": "hlissner", - "repo": "ws-butler", - "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "ws-butler", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685385764, - "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3f33d77..e957529 100644 --- a/flake.nix +++ b/flake.nix @@ -8,9 +8,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; + # hyprland.url = "github:hyprwm/Hyprland"; stylix.url = "github:danth/stylix"; - nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; + # nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/core/display.nix b/modules/core/display.nix index 0f4133b..f17fde1 100644 --- a/modules/core/display.nix +++ b/modules/core/display.nix @@ -2,19 +2,29 @@ config, pkgs, lib, - inputs, ... }: { # Display manager services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; + # services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.lightdm.enable = true; services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "muon"; + services.xserver.displayManager.defaultSession = "none+xmonad"; # Window manager #services.xserver.windowManager.leftwm.enable = true; #services.xserver.windowManager.herbstluftwm.enable = true; + + services.xserver = { + # enable = true; + desktopManager = { + xterm.enable = false; + xfce.enable = true; + }; + }; + services.xserver.windowManager.xmonad = { enable = true; enableContribAndExtras = true; diff --git a/modules/core/network.nix b/modules/core/network.nix index 73247f4..4441527 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -5,7 +5,10 @@ ... }: { networking = { - interfaces.enp0s31f6.mtu = 1200; + interfaces.enp0s31f6 = { + mtu = 1200; + useDHCP = true; + }; networkmanager = { enable = true; wifi.macAddress = "random"; @@ -32,9 +35,9 @@ # slows down boot time systemd.services.NetworkManager-wait-online.enable = false; - # services.openvpn.servers = { - # remote = { config = ''config ${config.users.users.muon.home}/documents/openvpn/muon.ovpn''; }; - # }; + services.openvpn.servers = { + remote = { config = ''config ${config.users.users.muon.home}/documents/openvpn/muon.ovpn''; }; + }; # services.openssh = { # enable = true; diff --git a/modules/core/nix.nix b/modules/core/nix.nix index 63c966d..44eab95 100644 --- a/modules/core/nix.nix +++ b/modules/core/nix.nix @@ -81,7 +81,7 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://oxalica.cachix.org" - "https://hyprland.cachix.org" + # "https://hyprland.cachix.org" ]; trusted-public-keys = [ @@ -89,7 +89,7 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "oxalica.cachix.org-1:h0iRBw6tQD8+51ZvnNEBPbwLR58UD7klauDBWzBdugQ=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; }; diff --git a/modules/home/default.nix b/modules/home/default.nix index 5f057b6..104eb52 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -30,7 +30,7 @@ # ./hyprland # inputs.hyprland.homeManagerModules.default - inputs.nix-doom-emacs.hmModule - ./doom-emacs + # inputs.nix-doom-emacs.hmModule + # ./doom-emacs ]; } diff --git a/modules/home/helix/default.nix b/modules/home/helix/default.nix index 47b2668..8330ddd 100644 --- a/modules/home/helix/default.nix +++ b/modules/home/helix/default.nix @@ -8,6 +8,8 @@ enable = true; settings = { + theme = lib.mkForce "stylix_fix"; + keys.normal = { "C" = ["collapse_selection" "extend_to_line_end" "change_selection"]; "D" = ["extend_to_line_end" "delete_selection"]; @@ -134,8 +136,15 @@ }; themes = { - ui.selection = {bg = "white"; modifiers = ["reversed"];}; - ui.primary = {bg = "light-cyan"; modifiers = ["reversed"];}; + # ui.selection = {bg = "white"; modifiers = ["reversed"];}; + # ui.primary = {bg = "light-cyan"; modifiers = ["reversed"];}; + stylix_fix = { + inherits = "gruvbox"; + ui.selection = { bg = "#304a3d"; }; + ui.selection.primary = { bg = "#2f2f2f"; }; + ui.text = "#ff0000"; + ui.virtual.inlay-hint = "#ff0000"; + }; }; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 3612c7b..c578331 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -18,7 +18,6 @@ i3lock-fancy-rapid pkg-config alsa-utils - nslookup nmap traceroute @@ -50,7 +49,7 @@ logseq zotero armcord - freetube + # freetube texstudio texlive.combined.scheme-full mpv @@ -65,6 +64,10 @@ signal-desktop qbittorrent thunderbird + libreoffice + vscodium + freeplane + qutebrowser # dev psmisc @@ -83,6 +86,8 @@ minigalaxy cemu mindustry + steam-tui + steamcmd # media ffmpeg diff --git a/modules/home/theme/default.nix b/modules/home/theme/default.nix index 3f8d316..c1b05d1 100644 --- a/modules/home/theme/default.nix +++ b/modules/home/theme/default.nix @@ -7,7 +7,7 @@ ... }: let - theme-name = "mocha"; + theme-name = "gruvbox-dark-medium"; theme = "${pkgs.base16-schemes}/share/themes/${theme-name}.yaml"; wallpaper = pkgs.runCommand "image.png" {} '' COLOR=$(${pkgs.yq}/bin/yq -r .base00 ${theme}) @@ -43,5 +43,12 @@ in { programs.zellij.enable = true; programs.rofi.enable = true; + home.pointerCursor = { + name = "phinger-cursors-dark"; + package = pkgs.phinger-cursors; + size = 32; + gtk.enable = true; + }; + # config.services.xserver.desktopManager.wallpaper = ./wallpaper.jpg; } diff --git a/modules/home/tools/default.nix b/modules/home/tools/default.nix index 08c2b54..6665928 100644 --- a/modules/home/tools/default.nix +++ b/modules/home/tools/default.nix @@ -30,18 +30,18 @@ #"x-scheme-handler/discord" = ["WebCord.desktop"]; }; - texlive = pkgs.texlive.combine { - inherit - (pkgs.texlive) - scheme-small - noto - mweights - cm-super - cmbright - fontaxes - beamer - ; - }; + # texlive = pkgs.texlive.combine { + # inherit + # (pkgs.texlive) + # scheme-small + # noto + # mweights + # cm-super + # cmbright + # fontaxes + # beamer + # ; + # }; in { # home.packages = [texlive]; diff --git a/modules/unfree/nvidia.nix b/modules/unfree/nvidia.nix index f200030..ba38c33 100644 --- a/modules/unfree/nvidia.nix +++ b/modules/unfree/nvidia.nix @@ -14,6 +14,7 @@ "steam" "steam-original" "steam-run" + "steamcmd" ]; }; }; @@ -34,7 +35,11 @@ }; }; - programs.steam.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; hardware = { opengl = {