From f9b677f33d9c42fc9d1e095381d3d6ba420e38d3 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Wed, 20 Sep 2023 18:44:44 +0200 Subject: [PATCH] fix: fix issues --- flake.lock | 568 ++++++++++++++++++ flake.nix | 5 +- hosts/default.nix | 83 +-- hosts/vm/home.nix | 3 +- modules/desktop/gnome/default.nix | 6 +- modules/editors/default.nix | 3 +- .../emacs/{doom-emacs => }/.doom.d/config.el | 0 .../emacs/{doom-emacs => }/.doom.d/custom.el | 0 .../emacs/{doom-emacs => }/.doom.d/init.el | 0 .../{doom-emacs => }/.doom.d/packages.el | 0 modules/editors/emacs/default.nix | 4 - .../{doom-emacs/default.nix => home.nix} | 3 +- modules/services/default.nix | 3 +- 13 files changed, 584 insertions(+), 94 deletions(-) create mode 100644 flake.lock rename modules/editors/emacs/{doom-emacs => }/.doom.d/config.el (100%) rename modules/editors/emacs/{doom-emacs => }/.doom.d/custom.el (100%) rename modules/editors/emacs/{doom-emacs => }/.doom.d/init.el (100%) rename modules/editors/emacs/{doom-emacs => }/.doom.d/packages.el (100%) rename modules/editors/emacs/{doom-emacs/default.nix => home.nix} (92%) diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..378d4cb --- /dev/null +++ b/flake.lock @@ -0,0 +1,568 @@ +{ + "nodes": { + "doom-emacs": { + "inputs": { + "doom-emacs": "doom-emacs_2", + "doom-snippets": "doom-snippets", + "emacs-overlay": "emacs-overlay", + "emacs-so-long": "emacs-so-long", + "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" + ], + "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": 1694741217, + "narHash": "sha256-PsyQbRMvc/+5QXS5eahj6aS9xkp+eyOWO3nQ0uzqR/Y=", + "owner": "nix-community", + "repo": "nix-doom-emacs", + "rev": "e0c972b33eb6715d4a59b7de656008609f8d77bd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-doom-emacs", + "type": "github" + } + }, + "doom-emacs_2": { + "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-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": { + "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" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "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": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "07682fff75d41f18327a871088d20af2710d4744", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", + "repo": "home-manager", + "type": "github" + } + }, + "nix-straight": { + "flake": false, + "locked": { + "lastModified": 1694361489, + "narHash": "sha256-kjDp+j6OtrmqbtjQB5uuOtjS08+kgJQuxFqhWE1Y9Rw=", + "owner": "nix-community", + "repo": "nix-straight.el", + "rev": "748be99b84be0b130e946288099806a0f16d6e57", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-straight.el", + "type": "github" + } + }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685908677, + "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", + "owner": "guibou", + "repo": "nixGL", + "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", + "type": "github" + }, + "original": { + "owner": "guibou", + "repo": "nixGL", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1694937365, + "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1694959747, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "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" + } + }, + "nur": { + "locked": { + "lastModified": 1695224719, + "narHash": "sha256-d9C6aHzegT/9FdGgEWdL0cNvIyIHxhYOYnbLsH6iKnI=", + "owner": "nix-community", + "repo": "NUR", + "rev": "5c2601def1f7d89a29755b7ab31d7ed9b0319862", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "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": 1694696773, + "narHash": "sha256-lgrfqX5YCRXZSyLHyRpYIQf+DOpHswPm7Vcw3WUCRAk=", + "owner": "emacs-straight", + "repo": "org-mode", + "rev": "765a84ea252fd7f281340c40fdc97f696f8cac33", + "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": 1694600616, + "narHash": "sha256-R599Zdw9YzID7CRzWRcasz+ZZvZiagBFsuDWUvnNX4o=", + "owner": "hakimel", + "repo": "reveal.js", + "rev": "a4b7f9dff7ef360afdb6d0cb53fd89063cbe0b66", + "type": "github" + }, + "original": { + "owner": "hakimel", + "repo": "reveal.js", + "type": "github" + } + }, + "root": { + "inputs": { + "doom-emacs": "doom-emacs", + "home-manager": "home-manager", + "nixgl": "nixgl", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", + "nur": "nur" + } + }, + "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" + } + }, + "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" + } + }, + "systems": { + "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": 1694318094, + "narHash": "sha256-PQHn0HvcWGYhvrynYfTAFWF92TzNdFGV8cfjRG6nPeQ=", + "owner": "jcs-elpa", + "repo": "ts-fold", + "rev": "3dd7c477fb08874d1bbbcb2588029e7ebd4b445f", + "type": "github" + }, + "original": { + "owner": "jcs-elpa", + "repo": "ts-fold", + "type": "github" + } + }, + "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" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index be3f197..3492cf5 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,6 @@ { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; # Default Stable Nix Packages nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Unstable Nix Packages - dslr.url = "github:nixos/nixpkgs/nixos-22.11"; # Quick fix home-manager = { # User Package Management url = "github:nix-community/home-manager/release-23.05"; @@ -35,7 +34,7 @@ }; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, home-manager, darwin, nur, nixgl, dslr, doom-emacs, hyprland, plasma-manager, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, home-manager, nur, nixgl, doom-emacs, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. let # Variables that can be used in the config files. user = "ruther"; location = "$HOME/.setup"; @@ -44,7 +43,7 @@ nixosConfigurations = ( # NixOS configurations import ./hosts { # Imports ./hosts/default.nix inherit (nixpkgs) lib; - inherit inputs nixpkgs nixpkgs-unstable home-manager nur user location dslr doom-emacs hyprland plasma-manager; # Also inherit home-manager so it does not need to be defined here. + inherit inputs nixpkgs nixpkgs-unstable home-manager nur user location doom-emacs; # Also inherit home-manager so it does not need to be defined here. } ); diff --git a/hosts/default.nix b/hosts/default.nix index 6dfcbd8..ac535a1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,7 +11,7 @@ # └─ ./home.nix # -{ lib, inputs, nixpkgs, nixpkgs-unstable, home-manager, nur, user, location, dslr, doom-emacs, hyprland, plasma-manager, ... }: +{ lib, inputs, nixpkgs, nixpkgs-unstable, home-manager, nur, user, location, doom-emacs, ... }: let system = "x86_64-linux"; # System architecture @@ -26,50 +26,9 @@ let config.allowUnfree = true; # Allow proprietary software }; - fix = import dslr { - inherit system; - config.allowUnfree = true; # Allow proprietary software - }; - lib = nixpkgs.lib; in { - beelink = lib.nixosSystem { # Desktop profile - inherit system; - specialArgs = { - inherit inputs unstable system user location fix hyprland; - host = { - hostName = "beelink"; - mainMonitor = "HDMI-A-1"; - secondMonitor = "HDMI-A-2"; - }; - }; # Pass flake variable - modules = [ # Modules that are used. - nur.nixosModules.nur - ./beelink - ./configuration.nix - - home-manager.nixosModules.home-manager { # Home-Manager module that is used. - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit unstable user fix doom-emacs; - host = { - hostName = "beelink"; - mainMonitor = "HDMI-A-1"; - secondMonitor = "HDMI-A-2"; - }; - }; # Pass flake variable - home-manager.users.${user} = { - imports = [ - ./home.nix - ./beelink/home.nix - ]; - }; - } - ]; - }; - laptop = lib.nixosSystem { # Laptop profile inherit system; specialArgs = { @@ -100,40 +59,6 @@ in ]; }; - work = lib.nixosSystem { # Work profile - inherit system; - specialArgs = { - inherit unstable system inputs user location hyprland; - host = { - hostName = "work"; - mainMonitor = "eDP-1"; - secondMonitor = "HDMI-A-2"; - thirdMonitor = "DP-1"; - }; - }; - modules = [ - ./work - ./configuration.nix - - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit unstable user; - host = { - hostName = "work"; - mainMonitor = "eDP-1"; - secondMonitor = "HDMI-A-2"; - thirdMonitor = "DP-1"; - }; - }; - home-manager.users.${user} = { - imports = [(import ./home.nix)] ++ [(import ./work/home.nix)]; - }; - } - ]; - }; - vm = lib.nixosSystem { # VM profile inherit system; specialArgs = { @@ -164,10 +89,10 @@ in ]; }; - desktop = lib.nixosSystem { # DEPRECATED Desktop profile + desktop = lib.nixosSystem { # Desktop profile inherit system; specialArgs = { - inherit inputs unstable system user location fix hyprland; + inherit inputs unstable system user location; host = { hostName = "desktop"; mainMonitor = "HDMI-A-1"; @@ -183,7 +108,7 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit unstable user fix doom-emacs; + inherit unstable user doom-emacs; host = { hostName = "desktop"; #For Xorg iGPU | Hyprland iGPU mainMonitor = "HDMI-A-1"; #HDMIA3 | HDMI-A-3 diff --git a/hosts/vm/home.nix b/hosts/vm/home.nix index 79d84d2..b5a7b5d 100644 --- a/hosts/vm/home.nix +++ b/hosts/vm/home.nix @@ -16,7 +16,8 @@ { imports = [ - ../../modules/desktop/qtile/home.nix #Window Manager + ../../modules/desktop/gnome/home.nix #Window Manager + ../../modules/editors/emacs/home.nix #Doom emacs ]; home = { # Specific packages for desktop diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix index 9b9ad92..b3985c6 100644 --- a/modules/desktop/gnome/default.nix +++ b/modules/desktop/gnome/default.nix @@ -18,8 +18,8 @@ xserver = { enable = true; - layout = "us, cz"; # Keyboard layout & €-sign - xkbLayout = ", qwerty"; + layout = "us,cz"; # Keyboard layout & €-sign + xkbVariant = ",qwerty"; xkbOptions = "eurosign:e"; libinput.enable = true; modules = [ pkgs.xf86_input_wacom ]; # Both needed for wacom tablet usage @@ -33,7 +33,7 @@ ]; }; - hardware.pipewire.enable = false; + services.pipewire.enable = false; environment = { systemPackages = with pkgs; [ # Packages installed diff --git a/modules/editors/default.nix b/modules/editors/default.nix index b7b564d..8e81e35 100644 --- a/modules/editors/default.nix +++ b/modules/editors/default.nix @@ -11,7 +11,8 @@ # [ - ./emacs/doom-emacs + ./emacs + ./nvim ] # Comment out emacs if you are not using native doom emacs. (import from host configuration.nix) diff --git a/modules/editors/emacs/doom-emacs/.doom.d/config.el b/modules/editors/emacs/.doom.d/config.el similarity index 100% rename from modules/editors/emacs/doom-emacs/.doom.d/config.el rename to modules/editors/emacs/.doom.d/config.el diff --git a/modules/editors/emacs/doom-emacs/.doom.d/custom.el b/modules/editors/emacs/.doom.d/custom.el similarity index 100% rename from modules/editors/emacs/doom-emacs/.doom.d/custom.el rename to modules/editors/emacs/.doom.d/custom.el diff --git a/modules/editors/emacs/doom-emacs/.doom.d/init.el b/modules/editors/emacs/.doom.d/init.el similarity index 100% rename from modules/editors/emacs/doom-emacs/.doom.d/init.el rename to modules/editors/emacs/.doom.d/init.el diff --git a/modules/editors/emacs/doom-emacs/.doom.d/packages.el b/modules/editors/emacs/.doom.d/packages.el similarity index 100% rename from modules/editors/emacs/doom-emacs/.doom.d/packages.el rename to modules/editors/emacs/.doom.d/packages.el diff --git a/modules/editors/emacs/default.nix b/modules/editors/emacs/default.nix index 6107b08..631b617 100644 --- a/modules/editors/emacs/default.nix +++ b/modules/editors/emacs/default.nix @@ -17,8 +17,4 @@ services.emacs = { enable = true; }; - - home.packages = [ - pkgs.emacs - ]; } diff --git a/modules/editors/emacs/doom-emacs/default.nix b/modules/editors/emacs/home.nix similarity index 92% rename from modules/editors/emacs/doom-emacs/default.nix rename to modules/editors/emacs/home.nix index 5985b04..e1349b9 100644 --- a/modules/editors/emacs/doom-emacs/default.nix +++ b/modules/editors/emacs/home.nix @@ -15,11 +15,12 @@ # -{ config, pkgs, location, ... }: +{ pkgs, ... }: let doom-emacs = pkgs.callPackage (builtins.fetchTarball { url = https://github.com/vlaci/nix-doom-emacs/archive/master.tar.gz; + sha256 = "1sczbw6q80l5qasbkp0lnsw8zsh79xg2prhnpv8qxn4zih72kx73"; }) { doomPrivateDir = ./doom.d; # Directory containing your config.el init.el # and packages.el files diff --git a/modules/services/default.nix b/modules/services/default.nix index ca0e310..6f8fccb 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -14,9 +14,8 @@ ./dunst.nix ./flameshot.nix ./picom.nix - ./polybar.nix - ./sxhkd.nix ./udiskie.nix + ./redshift.nix ] # redshift and media temporarely disables -- 2.48.1