diff --git a/flake.lock b/flake.lock index 3121f1b..ddac62c 100644 --- a/flake.lock +++ b/flake.lock @@ -166,47 +166,6 @@ "type": "github" } }, - "emacs": { - "inputs": { - "emacs-overlay": "emacs-overlay", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1676394233, - "narHash": "sha256-RHO/MgRyFqgmIgogrL5LBmBhAt8hTpUJJ6Dww46GyZI=", - "ref": "main", - "rev": "6fb9f917901160b2b212f420a8a8e4995c823626", - "revCount": 98, - "type": "git", - "url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git" - } - }, - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1676025076, - "narHash": "sha256-sdYhoZsLLwRXZebP6DYfIgQRjFA+itdNXaPuCWfJYkk=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "581072bb0d49768da9370056f7b6e7b761b5d8be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -239,29 +198,16 @@ "type": "github" } }, - "flake-compat_3": { - "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": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681037374, + "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "033b9f258ca96a10e543d4442071f614dc3f8412", "type": "github" }, "original": { @@ -286,54 +232,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681037374, - "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "033b9f258ca96a10e543d4442071f614dc3f8412", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "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" - } - }, - "flake-utils_5": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -351,7 +249,6 @@ "gitignore": { "inputs": { "nixpkgs": [ - "emacs", "pre-commit-hooks", "nixpkgs" ] @@ -386,27 +283,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -430,31 +306,9 @@ "type": "github" } }, - "howdy": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks_2" - }, - "locked": { - "lastModified": 1665343480, - "narHash": "sha256-mMaZFrDDiBcHDe8+lA87P3iMPea+RGfik5/E4Dyzk8U=", - "owner": "~moritzboehme", - "repo": "howdy", - "rev": "24a7cfb8c2fef1873275dbdf7c8ad562c22083de", - "type": "sourcehut" - }, - "original": { - "owner": "~moritzboehme", - "repo": "howdy", - "type": "sourcehut" - } - }, "hypr-contrib": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1679036674, @@ -473,7 +327,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "wlroots": "wlroots", "xdph": "xdph" }, @@ -514,7 +368,7 @@ }, "hyprpaper": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1681080114, @@ -563,8 +417,8 @@ }, "neovim": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" }, "locked": { "dir": "contrib", @@ -609,11 +463,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1658161305, + "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", "type": "github" }, "original": { @@ -624,22 +478,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -656,38 +494,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1675758091, - "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1658161305, - "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1680669251, "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", @@ -703,7 +509,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1674641431, "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", @@ -719,7 +525,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1671983799, "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", @@ -735,7 +541,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1681028957, "narHash": "sha256-gKWkKT/nFg2d9HZyK7VAjRzkyPfKLx+uIGyWXDw0NB0=", @@ -751,7 +557,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1678898370, "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", @@ -786,64 +592,11 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": [ - "emacs", - "flake-utils" - ], + "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": [ - "emacs", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable" }, - "locked": { - "lastModified": 1675688762, - "narHash": "sha256-oit/SxMk0B380ASuztBGQLe8TttO1GJiXF8aZY9AYEc=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "ab608394886fb04b8a5df3cb0bab2598400e3634", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-utils": [ - "howdy", - "flake-utils" - ], - "nixpkgs": [ - "howdy", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1664708386, - "narHash": "sha256-aCD8UUGNYb5nYzRmtsq/0yP9gFOQQHr/Lsb5vW+mucw=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2e4a708918e14fdbd534cc94aaa9470cd19b2464", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_3": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_6", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable_2" - }, "locked": { "lastModified": 1680981441, "narHash": "sha256-Tqr2mCVssUVp1ZXXMpgYs9+ZonaWrZGPGltJz94FYi4=", @@ -866,11 +619,9 @@ "attic": "attic", "comment-box-nvim": "comment-box-nvim", "copilot-lua": "copilot-lua", - "emacs": "emacs", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils", "gitignore-nvim": "gitignore-nvim", "home-manager": "home-manager", - "howdy": "howdy", "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpaper": "hyprpaper", @@ -878,9 +629,9 @@ "master": "master", "neovim": "neovim", "nil": "nil", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects", - "pre-commit-hooks": "pre-commit-hooks_3", + "pre-commit-hooks": "pre-commit-hooks", "smartcolumn-nvim": "smartcolumn-nvim", "stable": "stable", "utils": "utils" diff --git a/flake.nix b/flake.nix index 96aa0d0..7a70cc7 100644 --- a/flake.nix +++ b/flake.nix @@ -7,67 +7,66 @@ ╚══════════════════════════════════════════════════════════╝ */ inputs = { + # Nix master.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; stable.url = "github:nixos/nixpkgs/nixos-22.11"; - pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; - flake-utils.url = "github:numtide/flake-utils"; - utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; utils.inputs.flake-utils.follows = "flake-utils"; - agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; + agenix.url = "github:ryantm/agenix"; + + attic.inputs.flake-utils.follows = "flake-utils"; + attic.inputs.nixpkgs-stable.follows = "stable"; + attic.inputs.nixpkgs.follows = "nixpkgs"; + attic.url = "github:zhaofengli/attic"; - home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.utils.follows = "flake-utils"; + home-manager.url = "github:nix-community/home-manager"; + nil.inputs.flake-utils.follows = "flake-utils"; + nil.inputs.nixpkgs.follows = "nixpkgs"; + nil.url = "github:oxalica/nil"; + + pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; + + # Neovim + neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment + + comment-box-nvim.flake = false; + comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim"; + + copilot-lua.flake = false; + copilot-lua.url = "github:zbirenbaum/copilot.lua"; + + gitignore-nvim.flake = false; + gitignore-nvim.url = "github:wintermute-cell/gitignore.nvim"; + + lspsaga-nvim.flake = false; + lspsaga-nvim.url = "github:glepnir/lspsaga.nvim"; + + nvim-treesitter-textsubjects.flake = false; + nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects"; + + smartcolumn-nvim.flake = false; + smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; + + # Hyprland + hypr-contrib.url = "github:hyprwm/contrib"; + hyprland.url = "github:hyprwm/Hyprland"; + hyprpaper.url = "github:hyprwm/hyprpaper"; + + # Laptop asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout"; asus-touchpad-numpad-driver.flake = false; + # Firefox user.js arkenfox-userjs.url = "github:arkenfox/user.js"; arkenfox-userjs.flake = false; - - howdy.url = "sourcehut:~moritzboehme/howdy"; - howdy.inputs.nixpkgs.follows = "nixpkgs"; - - emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main"; - - neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment - - nil.url = "github:oxalica/nil"; - nil.inputs.nixpkgs.follows = "nixpkgs"; - nil.inputs.flake-utils.follows = "flake-utils"; - - hyprland.url = "github:hyprwm/Hyprland"; - hyprpaper.url = "github:hyprwm/hyprpaper"; - hypr-contrib.url = "github:hyprwm/contrib"; - - nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects"; - nvim-treesitter-textsubjects.flake = false; - - smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; - smartcolumn-nvim.flake = false; - - copilot-lua.url = "github:zbirenbaum/copilot.lua"; - copilot-lua.flake = false; - - lspsaga-nvim.url = "github:glepnir/lspsaga.nvim"; - lspsaga-nvim.flake = false; - - comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim"; - comment-box-nvim.flake = false; - - gitignore-nvim.url = "github:wintermute-cell/gitignore.nvim"; - gitignore-nvim.flake = false; - - attic.url = "github:zhaofengli/attic"; - attic.inputs.nixpkgs.follows = "nixpkgs"; - attic.inputs.nixpkgs-stable.follows = "stable"; - attic.inputs.flake-utils.follows = "flake-utils"; }; /* @@ -85,7 +84,7 @@ channelsConfig.allowUnfree = true; lib = nixpkgs.lib.extend - (self: super: { my = import ./lib { lib = self; }; }); + (self: _: { my = import ./lib { lib = self; }; }); /* ╔══════════════════════════════════════════════════════════╗ @@ -97,9 +96,7 @@ inherit (self) lib; }; - channels.nixpkgs.overlaysBuilder = channels: [ - inputs.emacs.overlays.default - inputs.howdy.overlays.default + channels.nixpkgs.overlaysBuilder = _: [ inputs.hypr-contrib.overlays.default inputs.hyprland.overlays.default inputs.utils.overlay @@ -135,7 +132,6 @@ }; } inputs.agenix.nixosModules.age - inputs.howdy.nixosModules.default ]; diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 377c478..9dc9c88 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -1,12 +1,11 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ lib -, config -, pkgs -, inputs +{ pkgs , ... -}: { +}: + +{ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix diff --git a/hosts/nixos-desktop/hardware-configuration.nix b/hosts/nixos-desktop/hardware-configuration.nix index fab68a6..6ecf64c 100644 --- a/hosts/nixos-desktop/hardware-configuration.nix +++ b/hosts/nixos-desktop/hardware-configuration.nix @@ -3,7 +3,6 @@ # to /etc/nixos/configuration.nix instead. { config , lib -, pkgs , modulesPath , ... }: { diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index 3042652..42c242c 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -1,8 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config -, pkgs +{ pkgs , inputs , ... }: { @@ -11,11 +10,6 @@ ./hardware-configuration.nix ]; - # services.howdy = { - # enable = true; - # certainty = 3.0; - # }; - # BOOT boot = { supportedFilesystems = [ "btrfs" ]; diff --git a/hosts/nixos-laptop/hardware-configuration.nix b/hosts/nixos-laptop/hardware-configuration.nix index 216b8da..76defb8 100644 --- a/hosts/nixos-laptop/hardware-configuration.nix +++ b/hosts/nixos-laptop/hardware-configuration.nix @@ -1,10 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config -, lib -, pkgs -, modulesPath +{ modulesPath , ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/lib/default.nix b/lib/default.nix index da1b552..03dcebb 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,6 +1,6 @@ { lib, ... }: -lib.makeExtensible (self: rec { +lib.makeExtensible (_: rec { mkDate = longDate: lib.concatStringsSep "-" [ (builtins.substring 0 4 longDate) (builtins.substring 4 2 longDate) diff --git a/modules/config/default.nix b/modules/config/default.nix index 7312bcb..f2be122 100644 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -1,9 +1,3 @@ -{ config -, lib -, pkgs -, ... -}: - { imports = [ ./bin diff --git a/modules/config/nix.nix b/modules/config/nix.nix index a932cbb..12fcc32 100644 --- a/modules/config/nix.nix +++ b/modules/config/nix.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , inputs , ... }: diff --git a/modules/config/shell.nix b/modules/config/shell.nix index c491d49..9a4811b 100644 --- a/modules/config/shell.nix +++ b/modules/config/shell.nix @@ -1,13 +1,8 @@ -{ config -, lib -, pkgs +{ lib , ... }: with lib; -let - cfg = config.my.shell; -in { options.my.shell = { abbreviations = mkOption { diff --git a/modules/config/theming/catppuccin.nix b/modules/config/theming/catppuccin.nix index bca09bc..0c8d8a9 100644 --- a/modules/config/theming/catppuccin.nix +++ b/modules/config/theming/catppuccin.nix @@ -1,6 +1,4 @@ { config -, lib -, pkgs , rosewater , flamingo , pink @@ -27,12 +25,9 @@ , base , mantle , crust +, ... }: -with lib; -let - cfg = config.my.theming; -in { home-manager.users.moritz = { programs = { diff --git a/modules/config/theming/default.nix b/modules/config/theming/default.nix index 4feefe9..31d8cb4 100644 --- a/modules/config/theming/default.nix +++ b/modules/config/theming/default.nix @@ -1,7 +1,6 @@ { config , lib , pkgs -, inputs , ... }: diff --git a/modules/config/theming/dracula.nix b/modules/config/theming/dracula.nix index 76fa25a..317926a 100644 --- a/modules/config/theming/dracula.nix +++ b/modules/config/theming/dracula.nix @@ -1,4 +1,7 @@ -{ config, lib, pkgs, ... }: +{ config +, lib +, ... +}: with lib; let diff --git a/modules/config/wallpapers.nix b/modules/config/wallpapers.nix index 526a017..c19d5a8 100644 --- a/modules/config/wallpapers.nix +++ b/modules/config/wallpapers.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/default.nix b/modules/default.nix index 7c695aa..6e3b243 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,9 +1,3 @@ -{ config -, lib -, pkgs -, ... -}: - { imports = [ ./config diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 29d9f23..755c68a 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -1,5 +1,4 @@ -{ config -, lib +{ lib , pkgs , ... }: diff --git a/modules/profiles/gaming.nix b/modules/profiles/gaming.nix index f6d6ac2..e773f20 100644 --- a/modules/profiles/gaming.nix +++ b/modules/profiles/gaming.nix @@ -1,6 +1,4 @@ -{ config -, lib -, pkgs +{ pkgs , ... }: { programs.steam.enable = true; diff --git a/modules/programs/adb.nix b/modules/programs/adb.nix index c839ce6..e773d4c 100644 --- a/modules/programs/adb.nix +++ b/modules/programs/adb.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 9674641..337d90c 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -1,16 +1,9 @@ -{ config -, lib -, pkgs -, ... -}: - { imports = [ ./adb.nix ./bspwm ./code.nix ./direnv.nix - ./emacs.nix ./firefox.nix ./fish.nix ./git.nix @@ -31,7 +24,6 @@ ./sway.nix ./thunar.nix ./nvim - ./xmonad ./zathura.nix ./zsh.nix ]; diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix index 92beef1..119ac6d 100644 --- a/modules/programs/direnv.nix +++ b/modules/programs/direnv.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix deleted file mode 100644 index 0d7128d..0000000 --- a/modules/programs/emacs.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config -, lib -, pkgs -, inputs -, ... -}: - -with lib; -let - cfg = config.my.programs.emacs; - myEmacs = pkgs.emacsPgtkWithPackages; -in -{ - options.my.programs.emacs.enable = mkEnableOption "emacs"; - - config = mkIf cfg.enable { - my.shell.aliases = { - emacs = "emacsclient -nw -a 'emacs -nw'"; - }; - fonts.fonts = with pkgs; [ - emacs-all-the-icons-fonts - (iosevka-bin.override { variant = "aile"; }) - ]; - users.users.moritz.packages = [ myEmacs ]; - home-manager.users.moritz = { - home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; - services.emacs = { - enable = true; - package = myEmacs; - }; - }; - }; -} diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix index d0f8e4d..8461c47 100644 --- a/modules/programs/firefox.nix +++ b/modules/programs/firefox.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , inputs , ... }: diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index 5ac37d0..1101cbf 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -1,7 +1,6 @@ { config , lib , pkgs -, inputs , ... }: diff --git a/modules/programs/git.nix b/modules/programs/git.nix index fa4fab0..225e50b 100644 --- a/modules/programs/git.nix +++ b/modules/programs/git.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/gpg.nix b/modules/programs/gpg.nix index 5371d62..64ce070 100644 --- a/modules/programs/gpg.nix +++ b/modules/programs/gpg.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/helix.nix b/modules/programs/helix.nix index 821a09c..3b9749a 100644 --- a/modules/programs/helix.nix +++ b/modules/programs/helix.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/hub.nix b/modules/programs/hub.nix index 14b9c60..1b55770 100644 --- a/modules/programs/hub.nix +++ b/modules/programs/hub.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 49a235d..cb2b447 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: @@ -161,7 +160,6 @@ in bind = $mainMod , B , exec , rofi-bluetooth bind = $mainMod , C , exec , rofi -show calc -modi calc -no-show-match -no-sort | wl-copy bind = $mainMod , D , exec , hyprctl keyword general:layout dwindle - bind = $mainMod , E , exec , emacsclient -c -a emacs bind = $mainMod , M , exec , hyprctl keyword general:layout master bind = $mainMod , R , exec , rofi -show combi bind = $mainMod , RETURN , exec , kitty diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix index 874ef2d..bbe7a6b 100644 --- a/modules/programs/kakoune.nix +++ b/modules/programs/kakoune.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix index 76c4a10..1261a65 100644 --- a/modules/programs/kitty.nix +++ b/modules/programs/kitty.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/ledger/default.nix b/modules/programs/ledger/default.nix index 348e0e1..ce54b3e 100644 --- a/modules/programs/ledger/default.nix +++ b/modules/programs/ledger/default.nix @@ -18,7 +18,7 @@ in }; aliases = let - applyCommon = name: command: "${command} --payee note --strict --explicit"; + applyCommon = _: command: "${command} --payee note --strict --explicit"; in mapAttrs applyCommon { bal = "ledger bal"; diff --git a/modules/programs/python.nix b/modules/programs/python.nix index adecd55..0310b08 100644 --- a/modules/programs/python.nix +++ b/modules/programs/python.nix @@ -9,7 +9,7 @@ let cfg = config.my.programs.python; pythonVersions = map (version: "3${toString version}") (range 8 11); - enabledVersions = filterAttrs (name: value: value.enable) cfg.versions; + enabledVersions = filterAttrs (_: value: value.enable) cfg.versions; pythonPackages = version: attrNames pkgs."python${version}Packages"; diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix index 2c484ae..f8b5ee2 100644 --- a/modules/programs/ssh.nix +++ b/modules/programs/ssh.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/xmonad/default.nix b/modules/programs/xmonad/default.nix deleted file mode 100644 index 80ceb83..0000000 --- a/modules/programs/xmonad/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config -, lib -, pkgs -, ... -}: - -with lib; -let - cfg = config.my.programs.xmonad; -in -{ - options.my.programs.xmonad.enable = mkEnableOption "xmonad"; - - config = lib.mkIf cfg.enable { - services = { - xserver = { - enable = true; - layout = "de"; - - displayManager = { - defaultSession = "none+xmonad"; - autoLogin = { - enable = true; - user = "moritz"; - }; - lightdm.enable = true; - }; - windowManager.xmonad.enable = true; - }; - }; - home-manager.users.moritz = - let - xmonadPackages = haskellPackages: [ - haskellPackages.xmonad-contrib - haskellPackages.xmonad-extras - haskellPackages.xmonad - haskellPackages.xmobar - ]; - in - { - xsession.windowManager.xmonad = { - enable = true; - enableContribAndExtras = true; - config = ./xmonad.hs; - # extraPackages = xmonadPackages; - }; - programs.xmobar.enable = true; - }; - }; -} diff --git a/modules/programs/xmonad/xmonad.hs b/modules/programs/xmonad/xmonad.hs deleted file mode 100644 index 5c27ff3..0000000 --- a/modules/programs/xmonad/xmonad.hs +++ /dev/null @@ -1,39 +0,0 @@ -import XMonad - ( Choose, - Default (def), - Full, - KeyMask, - Mirror, - Tall, - X, - XConfig (modMask, terminal), - mod4Mask, - spawn, - xmonad, - ) -import XMonad.Hooks.EwmhDesktops (ewmh) -import XMonad.Util.EZConfig (additionalKeysP) - -myModMask :: KeyMask -myModMask = mod4Mask - -myTerminal :: String -myTerminal = "kitty" - -myKeys :: [(String, X ())] -myKeys = - [ ("M-d", spawn "rofi -show combi"), - ("M-e", spawn "emacsclient -c -a emacs"), - ("M-f", spawn "firefox") - ] - -myConfig :: (XConfig (Choose Tall (Choose (Mirror Tall) Full))) -myConfig = - def - { modMask = myModMask, - terminal = myTerminal - } - `additionalKeysP` myKeys - -main :: IO () -main = xmonad $ ewmh $ ewmhFullscreen myConfig diff --git a/modules/programs/zathura.nix b/modules/programs/zathura.nix index 4eb23e3..d561c67 100644 --- a/modules/programs/zathura.nix +++ b/modules/programs/zathura.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix index 50a6050..b8cc5ab 100644 --- a/modules/programs/zsh.nix +++ b/modules/programs/zsh.nix @@ -1,7 +1,6 @@ { config , lib , pkgs -, inputs , ... }: diff --git a/modules/services/default.nix b/modules/services/default.nix index 2ec3a7f..ac126e9 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,8 +1,4 @@ -{ config -, lib -, pkgs -, ... -}: { +{ imports = [ ./dunst.nix ./kdeconnect.nix diff --git a/modules/services/gammastep.nix b/modules/services/gammastep.nix index d951c1d..8c7b25e 100644 --- a/modules/services/gammastep.nix +++ b/modules/services/gammastep.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect.nix index 3ce2e31..3efd6a8 100644 --- a/modules/services/kdeconnect.nix +++ b/modules/services/kdeconnect.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/services/openconnect.nix b/modules/services/openconnect.nix index 6a9433a..87c37a1 100644 --- a/modules/services/openconnect.nix +++ b/modules/services/openconnect.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/services/wireguard.nix b/modules/services/wireguard.nix index 2c81285..5463f1a 100644 --- a/modules/services/wireguard.nix +++ b/modules/services/wireguard.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/modules/virtualisation/default.nix b/modules/virtualisation/default.nix index 74bd309..bcc1863 100644 --- a/modules/virtualisation/default.nix +++ b/modules/virtualisation/default.nix @@ -1,8 +1,3 @@ -{ config -, lib -, pkgs -, ... -}: { imports = [ ./podman.nix diff --git a/modules/virtualisation/podman.nix b/modules/virtualisation/podman.nix index 1698fe3..744004f 100644 --- a/modules/virtualisation/podman.nix +++ b/modules/virtualisation/podman.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: diff --git a/overlays/channels.nix b/overlays/channels.nix index 8c19d82..5c2a49a 100644 --- a/overlays/channels.nix +++ b/overlays/channels.nix @@ -1,6 +1,6 @@ -{ lib, inputs }: +{ inputs, ... }: -final: prev: { +_: prev: { master = import inputs.master { inherit (prev) system; config.allowUnfree = true; diff --git a/overlays/lib.nix b/overlays/lib.nix index 69b149a..0d1a251 100644 --- a/overlays/lib.nix +++ b/overlays/lib.nix @@ -1,5 +1,5 @@ -{ lib, inputs }: +{ lib, ... }: -final: prev: { +_: _: { inherit lib; } diff --git a/overlays/packages.nix b/overlays/packages.nix index d1fb9c3..d4c1bed 100644 --- a/overlays/packages.nix +++ b/overlays/packages.nix @@ -1,6 +1,6 @@ -{ inputs, lib }: +{ inputs, ... }: -final: prev: +_: prev: { agenix = inputs.agenix.packages.${prev.system}.default; attic = inputs.attic.packages.${prev.system}.default; diff --git a/overlays/wayland.nix b/overlays/wayland.nix index f88709a..0ad9931 100644 --- a/overlays/wayland.nix +++ b/overlays/wayland.nix @@ -1,4 +1,4 @@ -{ lib, inputs }: +_: final: prev: { neovide-hyprland = final.symlinkJoin {