Move niri to nixos configuration instead
This commit is contained in:
parent
6cd0950e17
commit
5425486d1b
135
flake.lock
135
flake.lock
|
@ -18,68 +18,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"niri",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709610799,
|
||||
"narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "81c393c776d5379c030607866afef6406ca1be57",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"niri",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709274179,
|
||||
"narHash": "sha256-O6EC6QELBLHzhdzBOJj0chx8AOcd4nDRECIagfT5Nd0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "4be608f4f81d351aacca01b21ffd91028c23cc22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "monthly",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -135,46 +73,6 @@
|
|||
"url": "https://git.xenia.me.uk/pixelifytica/iosevka.git"
|
||||
}
|
||||
},
|
||||
"niri": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"fenix": "fenix",
|
||||
"flake-utils": "flake-utils",
|
||||
"nix-filter": "nix-filter",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716030039,
|
||||
"narHash": "sha256-MJh0CR2YHJE0GNnxaTcElNMuZUEI0pe9fvC0mfy4484=",
|
||||
"owner": "yalter",
|
||||
"repo": "niri",
|
||||
"rev": "d96a66ddff1a6b88dbe3e23b049f7075533b216f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "yalter",
|
||||
"ref": "v0.1.6",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-filter": {
|
||||
"locked": {
|
||||
"lastModified": 1705332318,
|
||||
"narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1710451336,
|
||||
|
@ -212,43 +110,10 @@
|
|||
"base16": "base16",
|
||||
"home-manager": "home-manager",
|
||||
"iosevka-custom": "iosevka-custom",
|
||||
"niri": "niri",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"tt-schemes": "tt-schemes"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1709219524,
|
||||
"narHash": "sha256-8HHRXm4kYQLdUohNDUuCC3Rge7fXrtkjBUf0GERxrkM=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "9efa23c4dacee88b93540632eb3d88c5dfebfe17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tt-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
59
flake.nix
59
flake.nix
|
@ -12,10 +12,6 @@
|
|||
url = "github:nix-community/home-manager/release-23.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
niri = {
|
||||
url = "github:yalter/niri/v0.1.6"; # Follow stable releases
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git";
|
||||
base16.url = "github:SenchoPens/base16.nix";
|
||||
tt-schemes = {
|
||||
|
@ -28,7 +24,6 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
niri,
|
||||
iosevka-custom,
|
||||
base16,
|
||||
tt-schemes,
|
||||
|
@ -38,36 +33,32 @@
|
|||
system ? "x86_64-linux",
|
||||
hostname ? "Atlas",
|
||||
...
|
||||
}:
|
||||
rec {
|
||||
inherit hostname;
|
||||
accentColour = "base07"; # catppuccin lavender
|
||||
catppuccinVariant = "Mocha";
|
||||
iosevkaCustom = {
|
||||
packages = iosevka-custom.outputs.packages.${system};
|
||||
names = iosevka-custom.outputs.names;
|
||||
};
|
||||
fonts = with iosevkaCustom; rec {
|
||||
sizes = {
|
||||
applications = 12;
|
||||
desktop = 10;
|
||||
popups = 14;
|
||||
terminal = 12;
|
||||
};
|
||||
serif = sansSerif;
|
||||
sansSerif = {
|
||||
name = names.iosevka-custom-aile;
|
||||
package = packages.iosevka-custom-aile;
|
||||
};
|
||||
monospace = {
|
||||
name = names.iosevka-custom-nerdfont;
|
||||
package = packages.iosevka-custom-nerdfont;
|
||||
};
|
||||
};
|
||||
}
|
||||
// {
|
||||
niri = niri.packages.${system}.default;
|
||||
}: rec {
|
||||
inherit hostname;
|
||||
accentColour = "base07"; # catppuccin lavender
|
||||
catppuccinVariant = "Mocha";
|
||||
iosevkaCustom = {
|
||||
packages = iosevka-custom.outputs.packages.${system};
|
||||
names = iosevka-custom.outputs.names;
|
||||
};
|
||||
fonts = with iosevkaCustom; rec {
|
||||
sizes = {
|
||||
applications = 12;
|
||||
desktop = 10;
|
||||
popups = 14;
|
||||
terminal = 12;
|
||||
};
|
||||
serif = sansSerif;
|
||||
sansSerif = {
|
||||
name = names.iosevka-custom-aile;
|
||||
package = packages.iosevka-custom-aile;
|
||||
};
|
||||
monospace = {
|
||||
name = names.iosevka-custom-nerdfont;
|
||||
package = packages.iosevka-custom-nerdfont;
|
||||
};
|
||||
};
|
||||
};
|
||||
defaultModules = {
|
||||
username ? "pixelifytica",
|
||||
hostname ? "Atlas",
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
niri,
|
||||
fonts,
|
||||
accentColour ? "base07",
|
||||
...
|
||||
|
@ -19,7 +18,6 @@
|
|||
./wlogout/default.nix
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
niri
|
||||
swaybg
|
||||
(writeShellScriptBin "protonmail-setup-bridge" ''
|
||||
pkill -9 -f protonmail-bridge
|
||||
|
|
Reference in a new issue