diff --git a/builds/minlog.nix b/builds/minlog.nix index c6c17af..223261d 100644 --- a/builds/minlog.nix +++ b/builds/minlog.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchgit, chez, gnumake, which, emacs, texliveFull }: +{ lib, stdenv, fetchgit, chez, which, emacs, texliveFull }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "minlog"; version = "2024-04-14"; diff --git a/builds/overlay.nix b/builds/overlay.nix deleted file mode 100644 index 7a27b27..0000000 --- a/builds/overlay.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Arguments to the overlay function: -{ ... }: -final: prev: { - minlog = prev.callPackage ./minlog.nix { }; -} - diff --git a/configuration.nix b/configuration.nix index 8d17a3e..76e65e1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,7 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { - # Include the results of the hardware scan. + # Importing necessary setup for Steam. imports = [ ./builds/steam/default.nix ]; # Use the systemd-boot EFI boot loader. @@ -10,29 +10,16 @@ efi.canTouchEfiVariables = true; }; - # Chose NetworkManager and hostname. + # Chose NetworkManager, timezone, internationalisation properties and console settings. networking.networkmanager.enable = true; - - # Set your time zone. time.timeZone = "Europe/Berlin"; - - # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; - console = { font = "Lat2-Terminus16"; # Use xkb.options in tty. useXkbConfig = true; }; - - # Garbage collect - nix.gc = { - automatic = true; # Enable the automatic garbage collector - dates = "10:00"; # When to run the garbage collector - options = "--delete-older-than 7d"; - }; - - # Enable Asterisks for Password prompt + # Enable Asterisks for Password prompt. security.sudo = { enable = true; extraConfig = '' @@ -40,6 +27,13 @@ ''; }; + # Configuration of the Garbage collect. + nix.gc = { + automatic = true; # Enable the automatic garbage collector + dates = "10:00"; # When to run the garbage collector + options = "--delete-older-than 7d"; + }; + # Activate Flakes. nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -85,7 +79,7 @@ }; }; - # Basic Packages. + # Setting the Basic Packages. environment.systemPackages = with pkgs; [ (libsForQt5.callPackage ./home/themes/catppuccin-sddm.nix { }) @@ -104,16 +98,15 @@ libnotify + # For Saving the Auth of Nextcloud. seahorse libgnome-keyring - #gnome.nautilus + # For setting the necessary permissions for gnome.nautilus. lxqt.lxqt-policykit # provides a default authentication client for policykit - - # for Haskell project - haskellPackages.zlib ]; + # Adding Features to Dolphin. services.gvfs.enable = true; services.udisks2.enable = true; @@ -124,7 +117,7 @@ XDG_STATE_HOME = "$HOME/.local/state"; }; - # permissions for acpilight + # Setting the permissions for acpilight. services.udev = { enable = true; extraRules = '' @@ -138,12 +131,13 @@ allowUnfree = true; permittedInsecurePackages = [ "electron-25.9.0" ]; }; + # Enable zsh for setting it as shell for users. programs.zsh.enable = true; + # Enabling the Keyring. services.gnome.gnome-keyring.enable = true; security.pam.services.lightdm.enableGnomeKeyring = true; - #ssh.startAgent = true; # Set stateVersion. Leave it as set. system.stateVersion = "23.11"; diff --git a/flake.lock b/flake.lock index 805018b..bd4aae6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,34 +1,13 @@ { "nodes": { - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -53,20 +32,6 @@ "type": "github" } }, - "flake-compat_3": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -75,11 +40,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -109,37 +74,16 @@ "type": "indirect" } }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -153,29 +97,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -198,41 +124,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -301,28 +197,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-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" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -332,11 +206,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1730903510, + "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "type": "github" }, "original": { @@ -352,32 +226,11 @@ ] }, "locked": { - "lastModified": 1729551526, - "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -398,11 +251,11 @@ ] }, "locked": { - "lastModified": 1729147490, - "narHash": "sha256-F0/iQVbbIFctMPwK4JEd4fxVzNwaq7NnD5oen59S24s=", + "lastModified": 1732775233, + "narHash": "sha256-G9W0wi0MD9JvG3bmvWQSMVR684drSlWGY1auhCNxO8c=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e2047498667aeb24e8493ff430a20cff713915f4", + "rev": "b09ab000f85a830fac6f599947dfa268227aab31", "type": "github" }, "original": { @@ -414,11 +267,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", + "lastModified": 1732733768, + "narHash": "sha256-y3LmGebXuQhLz9w1IzkDU8b464WvMvPCbIImpVvxmcI=", "owner": "neovim", "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", + "rev": "76dcc7029b200e1d85024d7ba4a34c602e730dbe", "type": "github" }, "original": { @@ -427,34 +280,13 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -504,41 +336,13 @@ "type": "indirect" } }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks_2", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1729602958, - "narHash": "sha256-eKGQKlj1oShfR6uqE1RjB4CgQ3DBrMS4VPrGPDKq1J4=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "b076f006c6b0cc6644a651bd21d4449cc3e7e56d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1729602553, - "narHash": "sha256-oxhl9eR2jSKy5T9xo8XBzbVkCwtkV2YZC1dMFczTThs=", + "lastModified": 1732784817, + "narHash": "sha256-I37vvlS+qk4TMzMouw9kJCilahl8+fOjnCWsBJmPv+U=", "owner": "nix-community", "repo": "NUR", - "rev": "74752053530eaf4928ad84db189291f31c21504e", + "rev": "7c412613e5ed3d49f2e198c0b0187add6b897b3d", "type": "github" }, "original": { @@ -547,34 +351,11 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728905062, - "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", - "owner": "NuschtOS", - "repo": "search", - "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs", - "nixvim": "nixvim", "nur": "nur", "wpaperd": "wpaperd", "xmonad-contrib": "xmonad-contrib" @@ -602,21 +383,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -631,6 +397,21 @@ "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" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -646,49 +427,13 @@ "type": "github" } }, - "systems_4": { - "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": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "unstable": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -704,14 +449,14 @@ "nixpkgs" ], "rust-overlay": "rust-overlay", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1729502360, - "narHash": "sha256-7lf5gcbLC7h+bfxGQGRc92pIb46UWsZCvN6CJrRJB4U=", + "lastModified": 1732723146, + "narHash": "sha256-Jd/+JMMn1lgm1Oe78du6DVkFWGCWvbNuSXsIKzcCeME=", "owner": "danyspin97", "repo": "wpaperd", - "rev": "a60671eb5b7029095ad387d06c051b547778fc55", + "rev": "459c4e9c8bdd0f8b0572751efc96b59a2dd4cc78", "type": "github" }, "original": { @@ -722,17 +467,17 @@ }, "xmonad": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "git-ignore-nix": "git-ignore-nix_2", "nixpkgs": "nixpkgs_4", "unstable": "unstable" }, "locked": { - "lastModified": 1728318022, - "narHash": "sha256-JYDe/lNgfiWl+QXZDtaLuU3sscybO9XQVupiFsoUInE=", + "lastModified": 1731735867, + "narHash": "sha256-eaC4wCtkpj/jvpc0X+7B/DI7p479lQEq1aPcf52V4EY=", "owner": "xmonad", "repo": "xmonad", - "rev": "eba9e97794705349f9c6a50230bb88b8ef7d539a", + "rev": "81cf71d7c6807fba14c1000aa40bfee84f7fa0e1", "type": "github" }, "original": { @@ -743,7 +488,7 @@ }, "xmonad-contrib": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "git-ignore-nix": "git-ignore-nix", "nixpkgs": [ "nixpkgs" @@ -751,11 +496,11 @@ "xmonad": "xmonad" }, "locked": { - "lastModified": 1729508337, - "narHash": "sha256-63EwF+O5y/MQm7cBihGpvhl2w7nYUSV9MhpfqooN5UA=", + "lastModified": 1732441885, + "narHash": "sha256-SKl/9dmpWpAs30YgQfB7jpdJuUYcPd50SqqUGGaswr0=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "c5032a43fbb95592d6aac4f906878a9abd744cf0", + "rev": "0dc879698def6325352886c3923299cfc951ca8e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d29b2bd..e3bea06 100644 --- a/flake.nix +++ b/flake.nix @@ -13,11 +13,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nur = { url = "github:nix-community/NUR"; }; neovim-nightly-overlay = { @@ -32,67 +27,66 @@ }; - outputs = - { nixpkgs, xmonad-contrib, home-manager, nur, nixvim, ... }@inputs: { - formatter.x86_64-linux = - nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; - nixosConfigurations = { - eliasLaptop = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./machines/configuration-laptop.nix - ./home/services/pipewire.nix - nur.nixosModules.nur - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; - users.elias = import ./home/default-laptop.nix; - }; - nixpkgs.overlays = [ - (final: prev: { - xmobar = final.haskellPackages.callPackage - ./home/programs/xmonad/src/xmobar/default.nix { }; - }) - inputs.neovim-nightly-overlay.overlays.default - inputs.wpaperd.overlays.default - inputs.nur.overlay - (import builds/overlay.nix { }) - (import overlays/obsidian.nix) - ]; - } - ] ++ xmonad-contrib.nixosModules; - }; - eliasDesktop = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./machines/configuration-desktop.nix - ./home/services/pipewire.nix - nur.nixosModules.nur - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; - users.elias = import ./home/default-desktop.nix; - }; - nixpkgs.overlays = [ - (final: prev: { - xmobar = final.haskellPackages.callPackage - ./home/programs/xmonad/src/xmobar/default.nix { }; - }) - inputs.neovim-nightly-overlay.overlays.default - inputs.wpaperd.overlays.default - inputs.nur.overlay - (import builds/overlay.nix { }) - (import overlays/obsidian.nix) - ]; - } - ] ++ xmonad-contrib.nixosModules; - }; + outputs = { nixpkgs, xmonad-contrib, home-manager, nur, ... }@inputs: { + formatter.x86_64-linux = + nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; + nixosConfigurations = { + eliasLaptop = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./machines/configuration-laptop.nix + ./home/services/pipewire.nix + nur.nixosModules.nur + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs; }; + users.elias = import ./home/default-laptop.nix; + }; + nixpkgs.overlays = [ + (final: prev: { + xmobar = final.haskellPackages.callPackage + ./home/programs/xmonad/src/xmobar/default.nix { }; + }) + inputs.neovim-nightly-overlay.overlays.default + inputs.wpaperd.overlays.default + inputs.nur.overlay + (import overlays/minlog.nix) + (import overlays/obsidian.nix) + ]; + } + ] ++ xmonad-contrib.nixosModules; + }; + eliasDesktop = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./machines/configuration-desktop.nix + ./home/services/pipewire.nix + nur.nixosModules.nur + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs; }; + users.elias = import ./home/default-desktop.nix; + }; + nixpkgs.overlays = [ + (final: prev: { + xmobar = final.haskellPackages.callPackage + ./home/programs/xmonad/src/xmobar/default.nix { }; + }) + inputs.neovim-nightly-overlay.overlays.default + inputs.wpaperd.overlays.default + inputs.nur.overlay + (import overlays/minlog.nix) + (import overlays/obsidian.nix) + ]; + } + ] ++ xmonad-contrib.nixosModules; }; }; + }; } diff --git a/home/default-desktop.nix b/home/default-desktop.nix index c7d4cc5..2c498c3 100644 --- a/home/default-desktop.nix +++ b/home/default-desktop.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ ./programs/default-desktop.nix ./default.nix ]; diff --git a/home/default-laptop.nix b/home/default-laptop.nix index 9568adc..614c013 100644 --- a/home/default-laptop.nix +++ b/home/default-laptop.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ ./programs/default-laptop.nix ./default.nix ]; diff --git a/home/programs/cura/default.nix b/home/programs/cura/default.nix deleted file mode 100644 index 3e45ea9..0000000 --- a/home/programs/cura/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, config, ... }: - -{ - home.packages = with pkgs; [ cura ]; -} diff --git a/home/programs/dolphin/default.nix b/home/programs/dolphin/default.nix index f6d9f88..f5345f6 100644 --- a/home/programs/dolphin/default.nix +++ b/home/programs/dolphin/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ diff --git a/home/programs/dunst/default.nix b/home/programs/dunst/default.nix index 97d4601..98d01b6 100644 --- a/home/programs/dunst/default.nix +++ b/home/programs/dunst/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ dunst ]; diff --git a/home/programs/element/default.nix b/home/programs/element/default.nix index e25dd67..0ae6add 100644 --- a/home/programs/element/default.nix +++ b/home/programs/element/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ element-desktop ]; diff --git a/home/programs/eww/default.nix b/home/programs/eww/default.nix index 9f45849..aaf9c8a 100644 --- a/home/programs/eww/default.nix +++ b/home/programs/eww/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ eww ]; diff --git a/home/programs/eww/src/indent.log b/home/programs/eww/src/indent.log deleted file mode 100644 index 0668960..0000000 --- a/home/programs/eww/src/indent.log +++ /dev/null @@ -1,38 +0,0 @@ -INFO: latexindent.pl version 3.20.3, 2023-02-19, a script to indent .tex files - latexindent.pl lives here: /nix/store/2bhgwk9gsgp4kj73jwwnn7v8ib73mcmc-texlive-latexindent-3.20.3/scripts/latexindent/ - Mon May 13 16:20:34 2024 - Reading input from STDIN -INFO: Processing switches: - -y|--yaml: YAML settings specified via command line -INFO: Directory for backup files and indent.log: - . -INFO: Perl modules are being loaded from the following directories: - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/FindBin.pm - /nix/store/8ajjd67qfdyzp0hbpvd1mrpqdhnwjlqq-perl-5.38.2-env/lib/perl5/site_perl/5.38.2/YAML/Tiny.pm - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/File/Copy.pm - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/File/Basename.pm - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/Getopt/Long.pm - /nix/store/8ajjd67qfdyzp0hbpvd1mrpqdhnwjlqq-perl-5.38.2-env/lib/perl5/site_perl/5.38.2/File/HomeDir.pm -INFO: LatexIndent perl modules are being loaded from, for example: - /nix/store/2bhgwk9gsgp4kj73jwwnn7v8ib73mcmc-texlive-latexindent-3.20.3/scripts/latexindent/LatexIndent/Document.pm -INFO: YAML settings read: defaultSettings.yaml - Reading defaultSettings.yaml from /nix/store/2bhgwk9gsgp4kj73jwwnn7v8ib73mcmc-texlive-latexindent-3.20.3/scripts/latexindent/defaultSettings.yaml -INFO: YAML reading settings - Home directory is /home/elias - latexindent.pl didn't find indentconfig.yaml or .indentconfig.yaml - see all possible locations: https://latexindentpl.readthedocs.io/en/latest/sec-appendices.html#indentconfig-options) -INFO: YAML settings read: -y switch - YAML setting: "defaultIndent:' '" - quote found in -y switch - key: - value: defaultIndent:' ' - double-quoted string found in -y switch: "defaultIndent:' '", substitute to defaultIndent:' ' -INFO: Phase 1: searching for objects -INFO: Phase 2: finding surrounding indentation -INFO: Phase 3: indenting objects -INFO: Phase 4: final indentation check -INFO: Output routine: - Not outputting to file; see -w and -o switches for more options. - -------------- -INFO: Please direct all communication/issues to: - https://github.com/cmhughes/latexindent.pl diff --git a/home/programs/indent.log b/home/programs/indent.log deleted file mode 100644 index 7f623b9..0000000 --- a/home/programs/indent.log +++ /dev/null @@ -1,38 +0,0 @@ -INFO: latexindent.pl version 3.20.3, 2023-02-19, a script to indent .tex files - latexindent.pl lives here: /nix/store/2bhgwk9gsgp4kj73jwwnn7v8ib73mcmc-texlive-latexindent-3.20.3/scripts/latexindent/ - Sat May 11 18:27:59 2024 - Reading input from STDIN -INFO: Processing switches: - -y|--yaml: YAML settings specified via command line -INFO: Directory for backup files and indent.log: - . -INFO: Perl modules are being loaded from the following directories: - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/FindBin.pm - /nix/store/8ajjd67qfdyzp0hbpvd1mrpqdhnwjlqq-perl-5.38.2-env/lib/perl5/site_perl/5.38.2/YAML/Tiny.pm - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/File/Copy.pm - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/File/Basename.pm - /nix/store/40rr7blrifwcfzxih97y79qvh07ycakh-perl-5.38.2/lib/perl5/5.38.2/Getopt/Long.pm - /nix/store/8ajjd67qfdyzp0hbpvd1mrpqdhnwjlqq-perl-5.38.2-env/lib/perl5/site_perl/5.38.2/File/HomeDir.pm -INFO: LatexIndent perl modules are being loaded from, for example: - /nix/store/2bhgwk9gsgp4kj73jwwnn7v8ib73mcmc-texlive-latexindent-3.20.3/scripts/latexindent/LatexIndent/Document.pm -INFO: YAML settings read: defaultSettings.yaml - Reading defaultSettings.yaml from /nix/store/2bhgwk9gsgp4kj73jwwnn7v8ib73mcmc-texlive-latexindent-3.20.3/scripts/latexindent/defaultSettings.yaml -INFO: YAML reading settings - Home directory is /home/elias - latexindent.pl didn't find indentconfig.yaml or .indentconfig.yaml - see all possible locations: https://latexindentpl.readthedocs.io/en/latest/sec-appendices.html#indentconfig-options) -INFO: YAML settings read: -y switch - YAML setting: "defaultIndent:' '" - quote found in -y switch - key: - value: defaultIndent:' ' - double-quoted string found in -y switch: "defaultIndent:' '", substitute to defaultIndent:' ' -INFO: Phase 1: searching for objects -INFO: Phase 2: finding surrounding indentation -INFO: Phase 3: indenting objects -INFO: Phase 4: final indentation check -INFO: Output routine: - Not outputting to file; see -w and -o switches for more options. - -------------- -INFO: Please direct all communication/issues to: - https://github.com/cmhughes/latexindent.pl diff --git a/home/programs/inkscape/default.nix b/home/programs/inkscape/default.nix index 786fad8..54c32c8 100644 --- a/home/programs/inkscape/default.nix +++ b/home/programs/inkscape/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ inkscape ]; diff --git a/home/programs/libreoffice/default.nix b/home/programs/libreoffice/default.nix index 8ae598d..5f8bfcc 100644 --- a/home/programs/libreoffice/default.nix +++ b/home/programs/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ libreoffice-qt hunspell hunspellDicts.de_DE ]; diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index c5bc7ba..46be3da 100644 --- a/home/programs/neovim/default.nix +++ b/home/programs/neovim/default.nix @@ -77,7 +77,7 @@ in { # Lean lean # Python - ruff-lsp + ruff pyright isort python311Packages.autopep8 diff --git a/home/programs/neovim/lua/plugins/vimtex.lua b/home/programs/neovim/lua/plugins/vimtex.lua index 9a8aece..a81658a 100644 --- a/home/programs/neovim/lua/plugins/vimtex.lua +++ b/home/programs/neovim/lua/plugins/vimtex.lua @@ -11,6 +11,16 @@ return { end, }) + vim.g.vimtex_compiler_latexmk = { + options = { + "-verbose", + "-file-line-error", + "-synctex=1", + "-interaction=nonstopmode", + "-shell-escape", + }, + } + vim.g.vimtex_mappings_disable = { ["n"] = { "K" } } -- disable `K` as it conflicts with LSP hover vim.g.vimtex_quickfix_method = "pplatex" vim.g.vimtex_view_method = "zathura" diff --git a/home/programs/nextcloud/default.nix b/home/programs/nextcloud/default.nix index 3b668a5..caacb4f 100644 --- a/home/programs/nextcloud/default.nix +++ b/home/programs/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ nextcloud-client ]; diff --git a/home/programs/nixvim/default.nix b/home/programs/nixvim/default.nix deleted file mode 100644 index f8e7ea7..0000000 --- a/home/programs/nixvim/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: { - programs.nixvim = { - enable = true; - colorscheme = "catppuccin"; - colorschemes.catppuccin = { - enable = true; - settings = { flavour = "mocha"; }; - }; - }; -} - diff --git a/home/programs/picard/default.nix b/home/programs/picard/default.nix index 51f2e3b..739271c 100644 --- a/home/programs/picard/default.nix +++ b/home/programs/picard/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ picard ]; diff --git a/home/programs/pulseaudio/default.nix b/home/programs/pulseaudio/default.nix index 4177863..7121fd6 100644 --- a/home/programs/pulseaudio/default.nix +++ b/home/programs/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { xdg.configFile."pulseaudio-ctl/config".source = ./config; diff --git a/home/programs/spotify/app.toml b/home/programs/spotify/app.toml deleted file mode 100644 index 1fe970b..0000000 --- a/home/programs/spotify/app.toml +++ /dev/null @@ -1 +0,0 @@ -theme = "Catppuccin-mocha" diff --git a/home/programs/spotify/theme-catppuccin.toml b/home/programs/spotify/theme-catppuccin.toml deleted file mode 100644 index 2054873..0000000 --- a/home/programs/spotify/theme-catppuccin.toml +++ /dev/null @@ -1,98 +0,0 @@ -# Catppuccin themes for Spotify-player - -[[themes]] -name = "Catppuccin-mocha" -[themes.palette] -background = "#1E1E2E" -foreground = "#CDD6F4" -black = "#1E1E2E" -blue = "#89B4FA" -cyan = "#89DCEB" -green = "#A6E3A1" -magenta = "#CBA6F7" -red = "#F38BA8" -white = "#CDD6F4" -yellow = "#F9E2AF" -bright_black = "#1E1E2E" -bright_blue = "#89B4FA" -bright_cyan = "#89DCEB" -bright_green = "#A6E3A1" -bright_magenta = "#CBA6F7" -bright_red = "#F38BA8" -bright_white = "#CDD6F4" -bright_yellow = "#F9E2AF" - -[themes.component_style] -selection = { bg = "#313244", modifiers = ["Bold"] } - -[[themes]] -name = "Catppuccin-latte" -[themes.palette] -background = "#EFF1F5" -foreground = "#4C4F69" -black = "#EFF1F5" -blue = "#1E66F5" -cyan = "#04A5E5" -green = "#40A02B" -magenta = "#8839EF" -red = "#D20F39" -white = "#4C4F69" -yellow = "#DF8E1D" -bright_black = "#EFF1F5" -bright_blue = "#1E66F5" -bright_cyan = "#04A5E5" -bright_green = "#40A02B" -bright_magenta = "#8839EF" -bright_red = "#D20F39" -bright_white = "#4C4F69" -bright_yellow = "#DF8E1D" -[themes.component_style] -selection = { bg = "#CCD0DA", modifiers = ["Bold"] } - -[[themes]] -name = "Catppuccin-frappe" -[themes.palette] -background = "#303446" -foreground = "#C6D0F5" -black = "#303446" -blue = "#8CAAEE" -cyan = "#89DCEB" -green = "#A6D189" -magenta = "#CA9EE6" -red = "#E78284" -white = "#C6D0F5" -yellow = "#E5C890" -bright_black = "#303446" -bright_blue = "#8CAAEE" -bright_cyan = "#89DCEB" -bright_green = "#A6D189" -bright_magenta = "#CA9EE6" -bright_red = "#E78284" -bright_white = "#C6D0F5" -bright_yellow = "#E5C890" -[themes.component_style] -selection = { bg = "#414559", modifiers = ["Bold"] } - -[[themes]] -name = "Catppuccin-macchiato" -[themes.palette] -background = "#24273A" -foreground = "#CAD3F5" -black = "#24273A" -blue = "#8AADF4" -cyan = "#91D7E3" -green = "#A6DA95" -magenta = "#C6A0F6" -red = "#ED8796" -white = "#CAD3F5" -yellow = "#EED49F" -bright_black = "#24273A" -bright_blue = "#8AADF4" -bright_cyan = "#91D7E3" -bright_green = "#A6DA95" -bright_magenta = "#C6A0F6" -bright_red = "#ED8796" -bright_white = "#CAD3F5" -bright_yellow = "#EED49F" -[themes.component_style] -selection = { bg = "#363A4F", modifiers = ["Bold"] } diff --git a/home/programs/stack/default.nix b/home/programs/stack/default.nix index 99ebaa8..c41b7a3 100644 --- a/home/programs/stack/default.nix +++ b/home/programs/stack/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ stack ]; diff --git a/home/programs/thunderbird/default.nix b/home/programs/thunderbird/default.nix index 8d2ef7e..993708a 100644 --- a/home/programs/thunderbird/default.nix +++ b/home/programs/thunderbird/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs.thunderbird = { diff --git a/home/services/pipewire.nix b/home/services/pipewire.nix index 725340f..1e63f45 100644 --- a/home/services/pipewire.nix +++ b/home/services/pipewire.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { security.rtkit.enable = true; diff --git a/home/themes/catppuccin-sddm.nix b/home/themes/catppuccin-sddm.nix index 0b0b6d6..0fb6b8c 100644 --- a/home/themes/catppuccin-sddm.nix +++ b/home/themes/catppuccin-sddm.nix @@ -1,13 +1,7 @@ -{ lib -, stdenv -, fetchFromGitHub -, sddm -, qtgraphicaleffects -, qtquickcontrols2 -, qtsvg -}: +{ lib, stdenv, fetchFromGitHub, sddm, qtgraphicaleffects, qtquickcontrols2 +, qtsvg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "catppuccin-sddm"; version = "unstable-2024-02-05"; @@ -18,12 +12,7 @@ stdenv.mkDerivation rec { hash = "sha256-0zoJOTFjQq3gm5i3xCRbyk781kB7BqcWWNrrIkWf2Xk="; }; - buildInputs = [ - sddm - qtgraphicaleffects - qtquickcontrols2 - qtsvg - ]; + buildInputs = [ sddm qtgraphicaleffects qtquickcontrols2 qtsvg ]; dontWrapQtApps = true; diff --git a/machines/configuration-desktop.nix b/machines/configuration-desktop.nix index b179fca..00db005 100644 --- a/machines/configuration-desktop.nix +++ b/machines/configuration-desktop.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { # Import general Configs diff --git a/machines/configuration-laptop.nix b/machines/configuration-laptop.nix index bf9ca8b..7d64da4 100644 --- a/machines/configuration-laptop.nix +++ b/machines/configuration-laptop.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { # Import general Configs diff --git a/overlays/minlog.nix b/overlays/minlog.nix new file mode 100644 index 0000000..506e553 --- /dev/null +++ b/overlays/minlog.nix @@ -0,0 +1 @@ +final: prev: { minlog = prev.callPackage ./../builds/minlog.nix { }; } diff --git a/overlays/obsidian.nix b/overlays/obsidian.nix index ddabddb..735a03d 100644 --- a/overlays/obsidian.nix +++ b/overlays/obsidian.nix @@ -3,7 +3,7 @@ final: prev: { src = prev.fetchurl { url = old.src.url; - hash = "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; + hash = "sha256-6IHqBvZx2yxQAvADi3Ok5Le3ip2/c6qafQ3FSpPT0po="; }; }); }