Compare commits

..

5 commits

7 changed files with 49 additions and 24 deletions

View file

@ -43,20 +43,12 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
nixosConfigurations = { nixosConfigurations = {
Archie = nixpkgs-unstable.lib.nixosSystem { Archie = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs-unstable { /*
system = "x86_64-linux"; I used to set up nixpkgs in the flake, but doing that made
config = { allowUnfree = true; }; # TODO: Find why this doesn't work defining overlays in modules impossible (or at least I could
overlays = not figure out how)
let Also has nice side effect of making it easier to add new systems :3
discordOverlay = self: super: { */
discord = super.discord.override {
withOpenASAR = true;
withVencord = true;
};
};
in
[ discordOverlay ];
};
modules = [ modules = [
# Needed for nix-index # Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
@ -72,10 +64,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
Everest = nixpkgs.lib.nixosSystem { Everest = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs {
system = "x86_64-linux";
config = { allowUnfree = false; }; # TODO: Find why this doesn't work
};
modules = [ modules = [
# Needed for nix-index # Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }

View file

@ -4,6 +4,7 @@
imports = [ imports = [
./htop.nix ./htop.nix
./nix.nix ./nix.nix
./micro.nix
./nix-index.nix ./nix-index.nix
./command-not-found.nix ./command-not-found.nix
]; ];
@ -11,7 +12,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
speedtest-cli speedtest-cli
bat bat
micro
nvd nvd
ncdu ncdu
tree tree

View file

@ -0,0 +1,17 @@
{ config, pkgs, ... }:
{
home-manager = {
users.toast = { config, pkgs, ... }:
{
programs.micro = {
enable = true;
settings = {
clipboard = "terminal";
indentchar = "|";
softwrap = true;
};
};
};
};
}

View file

@ -4,6 +4,7 @@
imports = [ imports = [
./discord.nix ./discord.nix
./firefox.nix ./firefox.nix
./micro.nix
./keepassxc.nix ./keepassxc.nix
]; ];
} }

View file

@ -1,9 +1,5 @@
{ config, pkgs, ... }: { 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 let
discordOverlay = self: super: { discordOverlay = self: super: {
discord = super.discord.override { discord = super.discord.override {
@ -12,7 +8,8 @@
}; };
}; };
in in
[ discordOverlay ]; */ {
nixpkgs.overlays = [ discordOverlay ];
users.users.toast.packages = with pkgs; [ users.users.toast.packages = with pkgs; [
discord discord
]; ];

21
roles/desktop/micro.nix Normal file
View 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 ];
};
};
}

View file

@ -13,6 +13,7 @@
enableSessionWide = true; enableSessionWide = true;
settings = { settings = {
preset = 4; preset = 4;
no_display = true;
}; };
}; };
}; };