try to reduce what's going on in the flake
This commit is contained in:
		
							parent
							
								
									1599875a5c
								
							
						
					
					
						commit
						7bb3b4b573
					
				
					 5 changed files with 61 additions and 132 deletions
				
			
		
							
								
								
									
										140
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										140
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -1,47 +1,5 @@
 | 
			
		|||
{
 | 
			
		||||
  "nodes": {
 | 
			
		||||
    "ags": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1715703984,
 | 
			
		||||
        "narHash": "sha256-0BZkMui6aCqswMCouvp0G90tAxDOxVnxTvG6TDZsDaI=",
 | 
			
		||||
        "owner": "Aylur",
 | 
			
		||||
        "repo": "ags",
 | 
			
		||||
        "rev": "11150225e62462bcd431d1e55185e810190a730a",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "Aylur",
 | 
			
		||||
        "repo": "ags",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "anyrun": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-parts": "flake-parts",
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ],
 | 
			
		||||
        "systems": "systems"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1717576207,
 | 
			
		||||
        "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=",
 | 
			
		||||
        "owner": "Kirottu",
 | 
			
		||||
        "repo": "anyrun",
 | 
			
		||||
        "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "Kirottu",
 | 
			
		||||
        "repo": "anyrun",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "blobs": {
 | 
			
		||||
      "flake": false,
 | 
			
		||||
      "locked": {
 | 
			
		||||
| 
						 | 
				
			
			@ -67,11 +25,11 @@
 | 
			
		|||
        "nixpkgs-stable": "nixpkgs-stable"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1718730505,
 | 
			
		||||
        "narHash": "sha256-xpO6/68SFj+hCXmTcB8PBltuVZJoOU0BTZSyax9dRw4=",
 | 
			
		||||
        "lastModified": 1718960968,
 | 
			
		||||
        "narHash": "sha256-5DzqO4O3ZKPGx1dO5QhwCGBaI4bPTg2BSWSzasTYdmM=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "emacs-overlay",
 | 
			
		||||
        "rev": "d98b82faa313f3a3ac1c3f00f98819eb75bfc00d",
 | 
			
		||||
        "rev": "728439cd9e68339c306d6152b8950dcb87e604cf",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -143,30 +101,9 @@
 | 
			
		|||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "flake-parts": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "nixpkgs-lib": [
 | 
			
		||||
          "anyrun",
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1717285511,
 | 
			
		||||
        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
 | 
			
		||||
        "owner": "hercules-ci",
 | 
			
		||||
        "repo": "flake-parts",
 | 
			
		||||
        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "hercules-ci",
 | 
			
		||||
        "repo": "flake-parts",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "flake-utils": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "systems": "systems_2"
 | 
			
		||||
        "systems": "systems"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1710146030,
 | 
			
		||||
| 
						 | 
				
			
			@ -184,7 +121,7 @@
 | 
			
		|||
    },
 | 
			
		||||
    "flake-utils_2": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "systems": "systems_3"
 | 
			
		||||
        "systems": "systems_2"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1705309234,
 | 
			
		||||
| 
						 | 
				
			
			@ -202,7 +139,7 @@
 | 
			
		|||
    },
 | 
			
		||||
    "flake-utils_3": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "systems": "systems_4"
 | 
			
		||||
        "systems": "systems_3"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1710146030,
 | 
			
		||||
| 
						 | 
				
			
			@ -220,7 +157,7 @@
 | 
			
		|||
    },
 | 
			
		||||
    "flake-utils_4": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "systems": "systems_5"
 | 
			
		||||
        "systems": "systems_4"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1710146030,
 | 
			
		||||
| 
						 | 
				
			
			@ -243,11 +180,11 @@
 | 
			
		|||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1718716991,
 | 
			
		||||
        "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
 | 
			
		||||
        "lastModified": 1718788307,
 | 
			
		||||
        "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "home-manager",
 | 
			
		||||
        "rev": "fab8e511d58f9c3f1cf8456abd685bfd381f7ebe",
 | 
			
		||||
        "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -319,11 +256,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixos-hardware": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1718548414,
 | 
			
		||||
        "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=",
 | 
			
		||||
        "lastModified": 1718894893,
 | 
			
		||||
        "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixos-hardware",
 | 
			
		||||
        "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06",
 | 
			
		||||
        "rev": "083823b7904e43a4fc1c7229781417e875359a42",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -362,11 +299,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs-stable": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1718447546,
 | 
			
		||||
        "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
 | 
			
		||||
        "lastModified": 1718811006,
 | 
			
		||||
        "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "842253bf992c3a7157b67600c2857193f126563a",
 | 
			
		||||
        "rev": "03d771e513ce90147b65fe922d87d3a0356fc125",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -378,11 +315,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs-stable_2": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1718447546,
 | 
			
		||||
        "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
 | 
			
		||||
        "lastModified": 1718811006,
 | 
			
		||||
        "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "842253bf992c3a7157b67600c2857193f126563a",
 | 
			
		||||
        "rev": "03d771e513ce90147b65fe922d87d3a0356fc125",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -442,11 +379,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs_4": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1718530797,
 | 
			
		||||
        "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
 | 
			
		||||
        "lastModified": 1718714799,
 | 
			
		||||
        "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
 | 
			
		||||
        "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -473,8 +410,6 @@
 | 
			
		|||
    },
 | 
			
		||||
    "root": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "ags": "ags",
 | 
			
		||||
        "anyrun": "anyrun",
 | 
			
		||||
        "emacs": "emacs",
 | 
			
		||||
        "eww": "eww",
 | 
			
		||||
        "home-manager": "home-manager",
 | 
			
		||||
| 
						 | 
				
			
			@ -516,11 +451,11 @@
 | 
			
		|||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1718681902,
 | 
			
		||||
        "narHash": "sha256-E/T7Ge6ayEQe7FVKMJqDBoHyLhRhjc6u9CmU8MyYfy0=",
 | 
			
		||||
        "lastModified": 1718936281,
 | 
			
		||||
        "narHash": "sha256-jslEDCVFoRcNilJT0xYGSxqMjOe+USnLknpHIAZJ02A=",
 | 
			
		||||
        "owner": "oxalica",
 | 
			
		||||
        "repo": "rust-overlay",
 | 
			
		||||
        "rev": "16c8ad83297c278eebe740dea5491c1708960dd1",
 | 
			
		||||
        "rev": "c9a793a5278f711a59fe77b9bf54b215667022c6",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -553,16 +488,16 @@
 | 
			
		|||
    },
 | 
			
		||||
    "systems": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1689347949,
 | 
			
		||||
        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
 | 
			
		||||
        "lastModified": 1681028828,
 | 
			
		||||
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
 | 
			
		||||
        "owner": "nix-systems",
 | 
			
		||||
        "repo": "default-linux",
 | 
			
		||||
        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
 | 
			
		||||
        "repo": "default",
 | 
			
		||||
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "nix-systems",
 | 
			
		||||
        "repo": "default-linux",
 | 
			
		||||
        "repo": "default",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
| 
						 | 
				
			
			@ -611,21 +546,6 @@
 | 
			
		|||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "systems_5": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1681028828,
 | 
			
		||||
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
 | 
			
		||||
        "owner": "nix-systems",
 | 
			
		||||
        "repo": "default",
 | 
			
		||||
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "nix-systems",
 | 
			
		||||
        "repo": "default",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "utils": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1605370193,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										27
									
								
								flake.nix
									
										
									
									
									
								
							
							
						
						
									
										27
									
								
								flake.nix
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -10,7 +10,10 @@
 | 
			
		|||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
    # hyprland = {
 | 
			
		||||
    #   url = "github:hyprwm/Hyprland";
 | 
			
		||||
    #   type = "git";
 | 
			
		||||
    #   url = "https://github.com/hyprwm/Hyprland";
 | 
			
		||||
    #   submodules = true;
 | 
			
		||||
    #   inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    # };
 | 
			
		||||
    # hyprland-plugins = {
 | 
			
		||||
    #   url = "github:hyprwm/hyprland-plugins";
 | 
			
		||||
| 
						 | 
				
			
			@ -20,10 +23,10 @@
 | 
			
		|||
      url = "github:elkowar/eww";
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
    ags = {
 | 
			
		||||
      url = "github:Aylur/ags";
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
    # ags = {
 | 
			
		||||
    #   url = "github:Aylur/ags";
 | 
			
		||||
    #   inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    # };
 | 
			
		||||
    emacs = {
 | 
			
		||||
      url = "github:nix-community/emacs-overlay";
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
| 
						 | 
				
			
			@ -34,10 +37,10 @@
 | 
			
		|||
    simple-nixos-mailserver = {
 | 
			
		||||
      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11";
 | 
			
		||||
    };
 | 
			
		||||
    anyrun = {
 | 
			
		||||
      url = "github:Kirottu/anyrun";
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
    # anyrun = {
 | 
			
		||||
    #   url = "github:Kirottu/anyrun";
 | 
			
		||||
    #   inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    # };
 | 
			
		||||
    libre-presenter = {
 | 
			
		||||
      url = "gitlab:chriscochrun/lumina";
 | 
			
		||||
    };
 | 
			
		||||
| 
						 | 
				
			
			@ -54,12 +57,13 @@
 | 
			
		|||
  outputs = { nixpkgs,
 | 
			
		||||
              nixpkgs-stable,
 | 
			
		||||
              home-manager,
 | 
			
		||||
              # hyprland,
 | 
			
		||||
              nixos-hardware,
 | 
			
		||||
              emacs,
 | 
			
		||||
              nix-bitcoin,
 | 
			
		||||
              libre-presenter,
 | 
			
		||||
              eww,
 | 
			
		||||
              ags,
 | 
			
		||||
              # ags,
 | 
			
		||||
              rust-overlay, ... }:
 | 
			
		||||
    let
 | 
			
		||||
      system = "x86_64-linux";
 | 
			
		||||
| 
						 | 
				
			
			@ -90,6 +94,7 @@
 | 
			
		|||
            {
 | 
			
		||||
              home-manager.useGlobalPkgs = true;
 | 
			
		||||
              home-manager.useUserPackages = true;
 | 
			
		||||
              # home-manager.extraSpecialArgs = { inherit ags; };
 | 
			
		||||
              home-manager.users.chris = import ./home/home.nix;
 | 
			
		||||
            }
 | 
			
		||||
          ];
 | 
			
		||||
| 
						 | 
				
			
			@ -105,7 +110,7 @@
 | 
			
		|||
            {
 | 
			
		||||
              home-manager.useGlobalPkgs = true;
 | 
			
		||||
              home-manager.useUserPackages = true;
 | 
			
		||||
              home-manager.extraSpecialArgs = { inherit ags; };
 | 
			
		||||
              # home-manager.extraSpecialArgs = { inherit ags; };
 | 
			
		||||
              home-manager.users.chris = import ./home/home.nix;
 | 
			
		||||
            }
 | 
			
		||||
          ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@ in
 | 
			
		|||
{
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./modules/hyprland.nix
 | 
			
		||||
    #ags.homeManagerModules.default
 | 
			
		||||
    # ags.homeManagerModules.default
 | 
			
		||||
  ];
 | 
			
		||||
  # Home Manager needs a bit of information about you and the
 | 
			
		||||
  # paths it should manage.
 | 
			
		||||
| 
						 | 
				
			
			@ -665,14 +665,14 @@ tooltip label {
 | 
			
		|||
    source = ../.config/fish/functions;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
 #programs.ags = {
 | 
			
		||||
 #  enable = true;
 | 
			
		||||
 #  extraPackages = with pkgs; [
 | 
			
		||||
 #    gtksourceview
 | 
			
		||||
 #    webkitgtk
 | 
			
		||||
 #    accountsservice
 | 
			
		||||
 #  ];
 | 
			
		||||
 #};
 | 
			
		||||
  # programs.ags = {
 | 
			
		||||
  #   enable = true;
 | 
			
		||||
  #   extraPackages = with pkgs; [
 | 
			
		||||
  #     gtksourceview
 | 
			
		||||
  #     webkitgtk
 | 
			
		||||
  #     accountsservice
 | 
			
		||||
  #   ];
 | 
			
		||||
  # };
 | 
			
		||||
 | 
			
		||||
  programs.fish = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -119,6 +119,10 @@ in
 | 
			
		|||
        };
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
     #debug = {
 | 
			
		||||
     #  enable_stdout_logs = false;
 | 
			
		||||
     #};
 | 
			
		||||
 | 
			
		||||
      general = {
 | 
			
		||||
        gaps_in = 15;
 | 
			
		||||
        gaps_out = 20;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,7 @@ with lib;
 | 
			
		|||
    dunst
 | 
			
		||||
    dvdbackup
 | 
			
		||||
    bottom
 | 
			
		||||
    ungoogled-chromium
 | 
			
		||||
    # ungoogled-chromium
 | 
			
		||||
    qutebrowser
 | 
			
		||||
    brave
 | 
			
		||||
    ttyper
 | 
			
		||||
| 
						 | 
				
			
			@ -35,7 +35,7 @@ with lib;
 | 
			
		|||
    krename
 | 
			
		||||
    kwallet-pam
 | 
			
		||||
    nm-tray
 | 
			
		||||
    nyxt
 | 
			
		||||
    # nyxt
 | 
			
		||||
    sbcl
 | 
			
		||||
    openjdk
 | 
			
		||||
    qmk
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue