Compare commits
	
		
			2 commits
		
	
	
		
			14eb2e1aaa
			...
			c858ac5d4c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							 | 
						c858ac5d4c | ||
| 
							 | 
						506aed82ff | 
					 6 changed files with 43 additions and 108 deletions
				
			
		
							
								
								
									
										86
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										86
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -40,39 +40,6 @@
 | 
			
		|||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "flake-utils_2": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "systems": "systems_2"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1731533236,
 | 
			
		||||
        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
 | 
			
		||||
        "owner": "numtide",
 | 
			
		||||
        "repo": "flake-utils",
 | 
			
		||||
        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "numtide",
 | 
			
		||||
        "repo": "flake-utils",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "flakey-profile": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1712898590,
 | 
			
		||||
        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
 | 
			
		||||
        "owner": "lf-",
 | 
			
		||||
        "repo": "flakey-profile",
 | 
			
		||||
        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "lf-",
 | 
			
		||||
        "repo": "flakey-profile",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "home-manager": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
| 
						 | 
				
			
			@ -94,41 +61,6 @@
 | 
			
		|||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "lix": {
 | 
			
		||||
      "flake": false,
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1746827285,
 | 
			
		||||
        "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
 | 
			
		||||
        "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
 | 
			
		||||
        "type": "tarball",
 | 
			
		||||
        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "type": "tarball",
 | 
			
		||||
        "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "lix-module": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-utils": "flake-utils",
 | 
			
		||||
        "flakey-profile": "flakey-profile",
 | 
			
		||||
        "lix": "lix",
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1746838955,
 | 
			
		||||
        "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
 | 
			
		||||
        "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
 | 
			
		||||
        "type": "tarball",
 | 
			
		||||
        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "type": "tarball",
 | 
			
		||||
        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "naersk": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "fenix": "fenix",
 | 
			
		||||
| 
						 | 
				
			
			@ -242,7 +174,7 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nix-vscode-extensions": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-utils": "flake-utils_2",
 | 
			
		||||
        "flake-utils": "flake-utils",
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
| 
						 | 
				
			
			@ -296,7 +228,6 @@
 | 
			
		|||
    "root": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "home-manager": "home-manager",
 | 
			
		||||
        "lix-module": "lix-module",
 | 
			
		||||
        "naersk": "naersk",
 | 
			
		||||
        "niri": "niri",
 | 
			
		||||
        "nix-vscode-extensions": "nix-vscode-extensions",
 | 
			
		||||
| 
						 | 
				
			
			@ -387,21 +318,6 @@
 | 
			
		|||
        "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"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "xwayland-satellite-stable": {
 | 
			
		||||
      "flake": false,
 | 
			
		||||
      "locked": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										29
									
								
								flake.nix
									
										
									
									
									
								
							
							
						
						
									
										29
									
								
								flake.nix
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -9,13 +9,6 @@
 | 
			
		|||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    lix-module = {
 | 
			
		||||
      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
 | 
			
		||||
      inputs = {
 | 
			
		||||
        nixpkgs.follows = "nixpkgs";
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    niri = {
 | 
			
		||||
      url = "github:sodiboo/niri-flake";
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
| 
						 | 
				
			
			@ -61,7 +54,6 @@
 | 
			
		|||
      self,
 | 
			
		||||
      nixpkgs,
 | 
			
		||||
      home-manager,
 | 
			
		||||
      lix-module,
 | 
			
		||||
      niri,
 | 
			
		||||
      zerforschen-plus,
 | 
			
		||||
      nixpkgs-unstable,
 | 
			
		||||
| 
						 | 
				
			
			@ -85,6 +77,19 @@
 | 
			
		|||
        "ronja-pc"
 | 
			
		||||
      ];
 | 
			
		||||
      forDevice = f: nixpkgs.lib.mapAttrs f devices;
 | 
			
		||||
      supported-systems = [
 | 
			
		||||
        "x86_64-linux"
 | 
			
		||||
        "aarch64-linux"
 | 
			
		||||
      ];
 | 
			
		||||
      forAllSystems =
 | 
			
		||||
        f:
 | 
			
		||||
        nixpkgs.lib.genAttrs supported-systems (
 | 
			
		||||
          system:
 | 
			
		||||
          f rec {
 | 
			
		||||
            inherit system;
 | 
			
		||||
            pkgs = nixpkgs.legacyPackages.${system};
 | 
			
		||||
          }
 | 
			
		||||
        );
 | 
			
		||||
    in
 | 
			
		||||
    rec {
 | 
			
		||||
      nixosConfigurations = forDevice (
 | 
			
		||||
| 
						 | 
				
			
			@ -97,13 +102,12 @@
 | 
			
		|||
        nixpkgs.lib.nixosSystem {
 | 
			
		||||
          inherit system specialArgs;
 | 
			
		||||
          modules = [
 | 
			
		||||
            lix-module.nixosModules.default
 | 
			
		||||
 | 
			
		||||
            { networking.hostName = device; }
 | 
			
		||||
 | 
			
		||||
            ./modules/globalinstalls.nix
 | 
			
		||||
            ./modules/networking.nix
 | 
			
		||||
            ./modules/nixpkgs.nix
 | 
			
		||||
            ./modules/lix.nix
 | 
			
		||||
 | 
			
		||||
            ./hosts/${device}/hardware.nix
 | 
			
		||||
            ./hosts/${device}/imports.nix
 | 
			
		||||
| 
						 | 
				
			
			@ -148,9 +152,6 @@
 | 
			
		|||
        };
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      formatter = {
 | 
			
		||||
        x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
 | 
			
		||||
        aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.nixfmt-rfc-style;
 | 
			
		||||
      };
 | 
			
		||||
      formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
 | 
			
		||||
    };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,13 +1,16 @@
 | 
			
		|||
{ pkgs, ... }:
 | 
			
		||||
{
 | 
			
		||||
  config = {
 | 
			
		||||
    home.packages = with pkgs.gnomeExtensions; [
 | 
			
		||||
    home.packages =
 | 
			
		||||
      with pkgs.gnomeExtensions;
 | 
			
		||||
      [
 | 
			
		||||
        gsconnect
 | 
			
		||||
        # battery-health-charging
 | 
			
		||||
        quick-settings-tweaker
 | 
			
		||||
        solaar-extension
 | 
			
		||||
        alphabetical-app-grid
 | 
			
		||||
    ] ++ (with pkgs; [foliate]);
 | 
			
		||||
      ]
 | 
			
		||||
      ++ (with pkgs; [ foliate ]);
 | 
			
		||||
 | 
			
		||||
    dconf.settings = {
 | 
			
		||||
      "org/gnome/shell" = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -37,6 +37,9 @@
 | 
			
		|||
      };
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    networking.firewall.allowedTCPPorts = [ 8776 1337 ];
 | 
			
		||||
    networking.firewall.allowedTCPPorts = [
 | 
			
		||||
      8776
 | 
			
		||||
      1337
 | 
			
		||||
    ];
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										12
									
								
								modules/lix.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								modules/lix.nix
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,12 @@
 | 
			
		|||
{ pkgs, ... }:
 | 
			
		||||
{
 | 
			
		||||
  nixpkgs.overlays = [ (final: prev: {
 | 
			
		||||
    inherit (prev.lixPackageSets.stable)
 | 
			
		||||
      nixpkgs-review
 | 
			
		||||
      nix-eval-jobs
 | 
			
		||||
      nix-fast-build
 | 
			
		||||
      colmena;
 | 
			
		||||
  }) ];
 | 
			
		||||
 | 
			
		||||
  nix.package = pkgs.lixPackageSets.stable.lix;
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue