FINALLY working

This commit is contained in:
vali 2024-04-10 19:42:28 +02:00
commit 36bfc54d6a
9 changed files with 83 additions and 36 deletions

39
flake.lock generated
View file

@ -65,6 +65,27 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1712730246,
"narHash": "sha256-iB8bFj+07RHpmt+XuGGvYQk2Iwm12u6+DklGq/+Tg5s=",
"owner": "nix-community",
"repo": "fenix",
"rev": "d402ae4a5e5676722290470f61a5e8e3155b5487",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -303,12 +324,30 @@
"root": {
"inputs": {
"agenix": "agenix",
"fenix": "fenix",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_2",
"nur": "nur",
"schizofox": "schizofox"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1712663608,
"narHash": "sha256-tN9ZL6kGppmHg84lxlpAlaN+kXWNctKK7Yitq/iXDEw=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "a5feb4f05f09adca661c869b1bf2324898cbaa43",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"schizofox": {
"inputs": {
"flake-compat": "flake-compat",

View file

@ -23,5 +23,10 @@
nixpkgs.follows = "nixpkgs";
};
};
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
}

View file

@ -40,9 +40,9 @@
themes = {
cursor = {
enable = true;
package = pkgs.bibabta.cursors;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = "24";
size = 24;
};
gtk = {
enable = true;

View file

@ -4,5 +4,6 @@ _: {
./programs.nix
./hardware-configuration.nix
./profile.nix
./i3.nix
];
}

View file

@ -0,0 +1,29 @@
{ pkgs, lib, config, ...}:
{
options = {
i3wm.enable = lib.mkEnableOption "enable i3wm";
};
config = lib.mkIf config.i3wm.enable {
services.xserver = {
enable = true;
desktopManager = {
xterm.enable = false;
xfce = {
enable = true;
noDesktop = true;
enableXfwm = false;
};
};
displayManager.defaultSession="xfce+i3";
windowManager.i3 = {
enable = true;
extraPackages = with pkgs; [
dmenu
i3status
i3lock
];
};
};
};
}

View file

@ -1,29 +0,0 @@
{ pkgs, lib, config, ...}:
{
options = {
i3wm.enable = lib.mkEnableOption "enable i3wm";
};
config = lib.mkIf config.i3wm.enable {
services.xserver = {
enable = true;
desktopManager = {
xterm.enable = false;
xfce = {
enable = true;
noDesktop = true;
enableXfwm = false;
};
};
displayManager.defaultSession="xfce+i3";
windowManager.i3 = {
enable = true;
extraPackages = with pkgs; [
dmenu
i3status
i3lock
];
};
};
};
}

View file

@ -1,9 +1,10 @@
{ config, inputs, pkgs, ... }:
let
username = config.myOptions.other.system.usermame;
username = config.myOptions.other.system.username;
in {
home-manager.users.${username} = {
home.packages = let
fenix = inputs.fenix.packages.${pkgs.system};
in with pkgs; [
pfetch

View file

@ -12,7 +12,7 @@
powerManagement.enable = false;
powerManagement.finegrained = false;
nvidiaSettings = false;
package = config.boot.kernel.kernelPackages.nvidiaPackages.beta;
package = config.boot.kernelPackages.nvidiaPackages.beta;
};
}

View file

@ -1,6 +1,7 @@
{ config, lib, ... }:
{
let
username = config.myOptions.other.system.username;
in {
networking = {
networkmanager = {
enable = true;
@ -11,5 +12,5 @@ networking = {
enable = true;
fallbackDns = ["9.9.9.9"];
};
users.users.config.myOptions.other.system.username.extraGroups = [ "networkmanager" ];
users.users.${username}.extraGroups = [ "networkmanager" ];
}