Compare commits
5 commits
e844d29eae
...
bb6c9ea5d1
| Author | SHA1 | Date | |
|---|---|---|---|
| bb6c9ea5d1 | |||
| ad8081bba3 | |||
| 79006c509b | |||
| 8975afd18d | |||
| 6df7d43e73 |
7 changed files with 49 additions and 24 deletions
24
flake.nix
24
flake.nix
|
|
@ -43,20 +43,12 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
|
|||
nixosConfigurations = {
|
||||
Archie = nixpkgs-unstable.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs-unstable {
|
||||
system = "x86_64-linux";
|
||||
config = { allowUnfree = true; }; # TODO: Find why this doesn't work
|
||||
overlays =
|
||||
let
|
||||
discordOverlay = self: super: {
|
||||
discord = super.discord.override {
|
||||
withOpenASAR = true;
|
||||
withVencord = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
[ discordOverlay ];
|
||||
};
|
||||
/*
|
||||
I used to set up nixpkgs in the flake, but doing that made
|
||||
defining overlays in modules impossible (or at least I could
|
||||
not figure out how)
|
||||
Also has nice side effect of making it easier to add new systems :3
|
||||
*/
|
||||
modules = [
|
||||
# Needed for nix-index
|
||||
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
|
||||
|
|
@ -72,10 +64,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
|
|||
|
||||
Everest = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
config = { allowUnfree = false; }; # TODO: Find why this doesn't work
|
||||
};
|
||||
modules = [
|
||||
# Needed for nix-index
|
||||
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
imports = [
|
||||
./htop.nix
|
||||
./nix.nix
|
||||
./micro.nix
|
||||
./nix-index.nix
|
||||
./command-not-found.nix
|
||||
];
|
||||
|
|
@ -11,7 +12,6 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
speedtest-cli
|
||||
bat
|
||||
micro
|
||||
nvd
|
||||
ncdu
|
||||
tree
|
||||
|
|
|
|||
17
roles/common/programs/micro.nix
Normal file
17
roles/common/programs/micro.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home-manager = {
|
||||
users.toast = { config, pkgs, ... }:
|
||||
{
|
||||
programs.micro = {
|
||||
enable = true;
|
||||
settings = {
|
||||
clipboard = "terminal";
|
||||
indentchar = "|";
|
||||
softwrap = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
imports = [
|
||||
./discord.nix
|
||||
./firefox.nix
|
||||
./micro.nix
|
||||
./keepassxc.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# TODO: Find out why this does not do anything. If I put this
|
||||
# on flake.nix it does work, so it's not completely wrong.
|
||||
/* nixpkgs.overlays =
|
||||
let
|
||||
discordOverlay = self: super: {
|
||||
discord = super.discord.override {
|
||||
|
|
@ -12,7 +8,8 @@
|
|||
};
|
||||
};
|
||||
in
|
||||
[ discordOverlay ]; */
|
||||
{
|
||||
nixpkgs.overlays = [ discordOverlay ];
|
||||
users.users.toast.packages = with pkgs; [
|
||||
discord
|
||||
];
|
||||
|
|
|
|||
21
roles/desktop/micro.nix
Normal file
21
roles/desktop/micro.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
home-manager = {
|
||||
users.toast = { config, pkgs, ... }:
|
||||
{
|
||||
programs.micro = {
|
||||
enable = true;
|
||||
settings = {
|
||||
# Use xclip/wl-clipboard for copying and pasting
|
||||
clipboard = lib.mkForce "external";
|
||||
};
|
||||
};
|
||||
/*
|
||||
On a kde wayland session micro uses xsel or xclip instead of wl-clipboard
|
||||
which doesn't work, so I only install wl-clipboard here to make micro use it
|
||||
*/
|
||||
home.packages = with pkgs; [ wl-clipboard ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
enableSessionWide = true;
|
||||
settings = {
|
||||
preset = 4;
|
||||
no_display = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue