Compare commits

...

5 commits

Author SHA1 Message Date
e4c8462b42 feat: add alacritty 2024-10-10 21:26:31 +02:00
999d623e54 Merge branch 'newmain' 2024-10-10 21:20:27 +02:00
fcce44f062 feat: add niri 2024-10-10 21:17:57 +02:00
428b0da86a fix(flake): order of stuff 2024-10-10 21:15:47 +02:00
292f0b1719 feat: add niri 2024-10-10 21:15:27 +02:00
4 changed files with 155 additions and 4 deletions

View file

@ -1,3 +1,5 @@
{ pkgs, ... }:
{ {
imports = [ ../common/home.nix ]; imports = [ ../common/home.nix ];
@ -40,4 +42,9 @@
]; ];
}; };
}; };
programs.niri = {
enable = true;
package = pkgs.niri;
};
} }

View file

@ -422,4 +422,6 @@
} }
''; '';
}; };
programs.alacritty.enable = true;
} }

View file

@ -43,6 +43,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"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"
}
},
"flatpaks": { "flatpaks": {
"locked": { "locked": {
"lastModified": 1728416205, "lastModified": 1728416205,
@ -80,6 +98,65 @@
"type": "github" "type": "github"
} }
}, },
"niri": {
"inputs": {
"flake-parts": "flake-parts_2",
"niri-stable": "niri-stable",
"niri-unstable": "niri-unstable",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable",
"xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1728579099,
"narHash": "sha256-cE2rv4xHe9l1xczfJmUnV7pKuDzFM8DtLDYndppiahg=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "3f80dcf1833101dc377b1c4e1659da4b8e86f3eb",
"type": "github"
},
"original": {
"owner": "sodiboo",
"repo": "niri-flake",
"type": "github"
}
},
"niri-stable": {
"flake": false,
"locked": {
"lastModified": 1726304152,
"narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"ref": "v0.1.9",
"repo": "niri",
"type": "github"
}
},
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1728546258,
"narHash": "sha256-iE6O7EBokq/HjjwouHfd7EGmED7TUkB9icSbUfPHWSo=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "859c0be0e5fa5ccf3c59f0ae1764551a930656fd",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"repo": "niri",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728472043, "lastModified": 1728472043,
@ -96,11 +173,40 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1727825735,
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1728500571,
"narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"anyrun": "anyrun", "anyrun": "anyrun",
"flatpaks": "flatpaks", "flatpaks": "flatpaks",
"home-manager": "home-manager", "home-manager": "home-manager",
"niri": "niri",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },
@ -118,6 +224,39 @@
"repo": "default-linux", "repo": "default-linux",
"type": "github" "type": "github"
} }
},
"xwayland-satellite-stable": {
"flake": false,
"locked": {
"lastModified": 1718165778,
"narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
"type": "github"
},
"original": {
"owner": "Supreeeme",
"ref": "v0.4",
"repo": "xwayland-satellite",
"type": "github"
}
},
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1726378112,
"narHash": "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "b962a0f33b503aa39c9cf6919f488b664e5b79b4",
"type": "github"
},
"original": {
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -2,17 +2,18 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
flatpaks.url = "github:gmodena/nix-flatpak/main"; flatpaks.url = "github:gmodena/nix-flatpak/main";
anyrun.url = "github:anyrun-org/anyrun"; anyrun.url = "github:anyrun-org/anyrun";
niri.url = "github:sodiboo/niri-flake";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
anyrun.inputs.nixpkgs.follows = "nixpkgs"; anyrun.inputs.nixpkgs.follows = "nixpkgs";
niri.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { nixpkgs, home-manager, flatpaks, anyrun, ... }: { outputs = { nixpkgs, home-manager, flatpaks, anyrun, niri, ... }: {
nixosConfigurations.ahrc-pc = nixpkgs.lib.nixosSystem { nixosConfigurations.ahrc-pc = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./ahrc-pc/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -23,13 +24,13 @@
./ahrc-pc/home.nix ./ahrc-pc/home.nix
]; ];
} }
./ahrc-pc/configuration.nix
]; ];
}; };
nixosConfigurations.ahrc-laptop = nixpkgs.lib.nixosSystem { nixosConfigurations.ahrc-laptop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./ahrc-laptop/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -37,9 +38,11 @@
home-manager.users.ahurac.imports = [ home-manager.users.ahurac.imports = [
flatpaks.homeManagerModules.nix-flatpak flatpaks.homeManagerModules.nix-flatpak
anyrun.homeManagerModules.default anyrun.homeManagerModules.default
niri.homeModules.niri
./ahrc-laptop/home.nix ./ahrc-laptop/home.nix
]; ];
} }
./ahrc-laptop/configuration.nix
]; ];
}; };
}; };