From 13e6a59810ea1a009af9c3af1ca53dc1069c5ba0 Mon Sep 17 00:00:00 2001 From: illustris Date: Wed, 23 Aug 2023 13:34:25 +0530 Subject: [PATCH] use home and plasma config from flake --- configuration.nix | 43 --------------------------------------- desktop-configuration.nix | 13 +++--------- flake.lock | 24 +++++++++++----------- flake.nix | 26 +++++++++++++++-------- 4 files changed, 33 insertions(+), 73 deletions(-) diff --git a/configuration.nix b/configuration.nix index a645cc3..637179c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -66,49 +66,6 @@ ]); }; - home-manager.users.illustris = { ... }: { - home = { - file.".emacs.d" = { - source = ./emacs.d; - recursive = true; - }; - stateVersion = "23.05"; - }; - programs.emacs = { - enable = true; - extraPackages = ( - epkgs: (with epkgs; [ - bpftrace-mode - cmake-mode - color-theme-modern - docker-compose-mode - dockerfile-mode - dtrace-script-mode - gitlab-ci-mode - go-mode - graphviz-dot-mode - haskell-mode - json-mode - markdown-mode - material-theme - nix-mode - puppet-mode - python-mode - strace-mode - terraform-mode - verilog-mode - yaml-mode - ]) - ); - }; - services.gpg-agent = { - enable = true; - defaultCacheTtl = 60*60*12; - defaultCacheTtlSsh = 60*60*12; - extraConfig = "auto-expand-secmem"; - }; - }; - # for ZFS networking.hostId = "f86b2fa7"; diff --git a/desktop-configuration.nix b/desktop-configuration.nix index 6ff57c3..7a6893f 100644 --- a/desktop-configuration.nix +++ b/desktop-configuration.nix @@ -1,12 +1,5 @@ { config, pkgs, lib, ... }: { - - nixpkgs.overlays = [ - (import ./overlays/suckless/st-overlay.nix) - # (import ./overlays/suckless/surf-overlay.nix) - (import ./overlays/suckless/dwm-overlay.nix) - ]; - environment.systemPackages = with pkgs; [ arandr # blender @@ -19,7 +12,7 @@ guake insomnia # kcachegrind - kicad + # kicad # 8GB libnotify mpv obs-studio @@ -76,10 +69,10 @@ }; xserver = { # defaultDepth = 30; - displayManager.defaultSession = "none+dwm"; + # displayManager.defaultSession = "none+dwm"; # desktopManager.plasma5.enable = true; dpi = 100; - enable = true; + # enable = true; videoDrivers = [ "nvidia" ]; wacom.enable = true; windowManager.dwm.enable = true; diff --git a/flake.lock b/flake.lock index 26acd8e..4a2162d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1691672736, - "narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=", + "lastModified": 1692720545, + "narHash": "sha256-DQDremUH7lRxiZEIVh6C6kQusuPe1vUKtiVl29nmP0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79", + "rev": "8eb8c212e50e2fd95af5849585a2eb819add0a1e", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1691225770, - "narHash": "sha256-O5slH8nW8msTAqVAS5rkvdHSkjmrO+JauuSDzZCmv2M=", + "lastModified": 1692448348, + "narHash": "sha256-/Wy9Bzw59A5OD82S9dWHshg+wiSzJNh95hPXNhO5K7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a014a729cdd54d9919ff36b714d047909d7a4c8", + "rev": "bdb5bcad01ff7332fdcf4b128211e81905113f84", "type": "github" }, "original": { @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1691299226, - "narHash": "sha256-MwiBiegxFVN3b12qJlBaNFqteoGKbqb72rgq4W2eG6k=", + "lastModified": 1692765999, + "narHash": "sha256-r04DKqMg8x91KMKZdQD+Wx4WsW4mhwknuWc+veC6wF0=", "owner": "illustris", "repo": "flake", - "rev": "0f1da78525c4e818defb1a4ec8c0ecb8371d3046", + "rev": "57e3d859a1cb58c3c1c2ff6e1beb2bf87564bc31", "type": "github" }, "original": { @@ -84,11 +84,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1692638711, + "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d9100ba..cb17aa2 100644 --- a/flake.nix +++ b/flake.nix @@ -23,17 +23,27 @@ system = "x86_64-linux"; modules = [ ./configuration.nix + { + environment.etc.flake.source = self; + nix.registry.nixpkgs.flake = nixpkgs; + nixpkgs.overlays = with illustris.overlays; [ + lib + pkgs + suckless + ]; + } home-manager.nixosModule - {nix.registry.np.flake = nixpkgs;} - {environment.etc.flake.source = self;} - {nixpkgs.overlays = [ - illustris.overlays.default - (self: super: { - lib = super.lib // illustris.lib; - }) - ];} + { + home-manager = { + useGlobalPkgs = true; + users.illustris = import ( + illustris + "/homeConfigurations/profiles/dailyDriver/home.nix" + ); + }; + } nixfs.nixosModules.nixfs {services.nixfs.enable = true;} + illustris.nixosModules.plasmonad ]; }; };