mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
added formatter and reformated
This commit is contained in:
parent
733eda4798
commit
e1987d6461
24 changed files with 286 additions and 284 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
system.stateVersion = "23.05";
|
system.stateVersion = "23.05";
|
||||||
environment = {
|
environment = {
|
||||||
defaultPackages = [];
|
defaultPackages = [ ];
|
||||||
binsh = "${pkgs.dash}/bin/dash";
|
binsh = "${pkgs.dash}/bin/dash";
|
||||||
variables = {
|
variables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
keep-outputs = false
|
keep-outputs = false
|
||||||
keep-derivations = false
|
keep-derivations = false
|
||||||
experimental-features = nix-command flakes
|
experimental-features = nix-command flakes
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
networking = {
|
networking = {
|
||||||
firewall = {
|
firewall = {
|
||||||
|
|
@ -41,20 +41,20 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
servers = [
|
servers = [
|
||||||
"time.google.com"
|
"time.google.com"
|
||||||
"time2.google.com"
|
"time2.google.com"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
console = {
|
console = {
|
||||||
font = "Lat2-Terminus16";
|
font = "Lat2-Terminus16";
|
||||||
useXkbConfig = true;
|
useXkbConfig = true;
|
||||||
};
|
};
|
||||||
#should be false
|
#should be false
|
||||||
sound.enable = false;
|
sound.enable = false;
|
||||||
|
|
||||||
# rtkit is optional but recommended
|
# rtkit is optional but recommended
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
jack.enable = true;
|
jack.enable = true;
|
||||||
};
|
};
|
||||||
#enable ssh
|
#enable ssh
|
||||||
programs = {
|
programs = {
|
||||||
mtr.enable = true;
|
mtr.enable = true;
|
||||||
gnupg.agent = {
|
gnupg.agent = {
|
||||||
|
|
|
||||||
76
flake.nix
76
flake.nix
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
@ -8,43 +8,47 @@
|
||||||
spicetify-nix.url = "github:the-argus/spicetify-nix";
|
spicetify-nix.url = "github:the-argus/spicetify-nix";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {self, nixpkgs, home-manager, spicetify-nix}@inputs:
|
outputs = { self, nixpkgs, home-manager, spicetify-nix }@inputs:
|
||||||
let
|
let
|
||||||
username = "gerg";
|
username = "gerg";
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
packageOverrides = super: let self = super.pkgs; in {
|
packageOverrides = super:
|
||||||
nerdfonts-overpass = self.nerdfonts.override {
|
let self = super.pkgs; in {
|
||||||
fonts = [ "Overpass" ];
|
nerdfonts-overpass = self.nerdfonts.override {
|
||||||
|
fonts = [ "Overpass" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
overlays = [
|
||||||
|
(final: prev: rec {
|
||||||
|
t-rex-miner = final.callPackage ./pkgs/t-rex-miner { };
|
||||||
|
afk-cmds = final.callPackage ./pkgs/afk-cmds { };
|
||||||
|
parrot = final.callPackage ./pkgs/parrot { };
|
||||||
|
discord = prev.discord.override {
|
||||||
|
withOpenASAR = true;
|
||||||
|
nss = prev.nss_latest;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
(import ./suckless)
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
lib = nixpkgs.lib;
|
||||||
overlays = [
|
in
|
||||||
(final: prev: rec {
|
{
|
||||||
t-rex-miner = final.callPackage ./pkgs/t-rex-miner {};
|
formatter.x86_64-linux = pkgs.nixpkgs-fmt;
|
||||||
afk-cmds = final.callPackage ./pkgs/afk-cmds {};
|
nixosConfigurations = {
|
||||||
parrot = final.callPackage ./pkgs/parrot {};
|
gerg-desktop = lib.nixosSystem {
|
||||||
discord = prev.discord.override {
|
inherit system pkgs;
|
||||||
withOpenASAR = true;
|
specialArgs = { inherit inputs username; };
|
||||||
nss = prev.nss_latest;
|
modules = [
|
||||||
};
|
./configuration.nix
|
||||||
})
|
|
||||||
(import ./suckless)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
lib = nixpkgs.lib;
|
|
||||||
in {
|
|
||||||
nixosConfigurations = {
|
|
||||||
gerg-desktop = lib.nixosSystem {
|
|
||||||
inherit system pkgs;
|
|
||||||
specialArgs = {inherit inputs username;};
|
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
./systems/desktop.nix
|
./systems/desktop.nix
|
||||||
home-manager.nixosModules.home-manager {
|
home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
|
|
@ -55,8 +59,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{config, pkgs, username, ...}:
|
{ config, pkgs, username, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./librewolf.nix
|
./librewolf.nix
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{pkgs, ...}:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs = {
|
programs = {
|
||||||
librewolf = {
|
librewolf = {
|
||||||
|
|
|
||||||
|
|
@ -1,67 +1,70 @@
|
||||||
{pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
vim-moonfly = pkgs.vimUtils.buildVimPlugin {
|
vim-moonfly = pkgs.vimUtils.buildVimPlugin {
|
||||||
pname = "vim-moonfly";
|
pname = "vim-moonfly";
|
||||||
version = "1.0.0";
|
version = "1.0.0";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "bluz71";
|
owner = "bluz71";
|
||||||
repo = "vim-moonfly-colors";
|
repo = "vim-moonfly-colors";
|
||||||
rev = "065c99b95355b33dfaa05bde11ad758e519b04a3";
|
rev = "065c99b95355b33dfaa05bde11ad758e519b04a3";
|
||||||
sha256 = "sha256-TEYN8G/VNxitpPJPM7+O9AGLm6V7bPkiTlFG5op55pI=";
|
sha256 = "sha256-TEYN8G/VNxitpPJPM7+O9AGLm6V7bPkiTlFG5op55pI=";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# home.packages = with pkgs; [rustc cargo rust-analyzer clang-tools];
|
# home.packages = with pkgs; [rustc cargo rust-analyzer clang-tools];
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
viAlias = true;
|
viAlias = true;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
vimdiffAlias = true;
|
vimdiffAlias = true;
|
||||||
extraPackages = with pkgs; [gcc ripgrep fd];
|
extraPackages = with pkgs; [ gcc ripgrep fd ];
|
||||||
plugins = with pkgs.vimPlugins; [
|
plugins = with pkgs.vimPlugins; [
|
||||||
nvim-treesitter.withAllGrammars
|
nvim-treesitter.withAllGrammars
|
||||||
rainbow nvim-ts-rainbow # rainbow for tree-sitter
|
rainbow
|
||||||
nvim-colorizer-lua # colors
|
nvim-ts-rainbow # rainbow for tree-sitter
|
||||||
nvim-tree-lua # file browser
|
nvim-colorizer-lua # colors
|
||||||
nvim-web-devicons # for tree-lua
|
nvim-tree-lua # file browser
|
||||||
vim-smoothie #smooth scrolling
|
nvim-web-devicons # for tree-lua
|
||||||
undotree # better undotree
|
vim-smoothie #smooth scrolling
|
||||||
indentLine # indentlines
|
undotree # better undotree
|
||||||
vim-smoothie #smooth scrolling
|
indentLine # indentlines
|
||||||
#non-trash auto completion
|
vim-smoothie #smooth scrolling
|
||||||
nvim-cmp
|
#non-trash auto completion
|
||||||
cmp-buffer
|
nvim-cmp
|
||||||
cmp-nvim-lsp
|
cmp-buffer
|
||||||
cmp-path
|
cmp-nvim-lsp
|
||||||
cmp-spell
|
cmp-path
|
||||||
cmp-treesitter
|
cmp-spell
|
||||||
cmp-vsnip
|
cmp-treesitter
|
||||||
vim-vsnip
|
cmp-vsnip
|
||||||
lspkind-nvim
|
vim-vsnip
|
||||||
nvim-lspconfig
|
lspkind-nvim
|
||||||
nvim-autopairs # auto brackets
|
nvim-lspconfig
|
||||||
telescope-nvim #search feature
|
nvim-autopairs # auto brackets
|
||||||
telescope-fzy-native-nvim # search plugin
|
telescope-nvim #search feature
|
||||||
gitsigns-nvim #in buffer git blame
|
telescope-fzy-native-nvim # search plugin
|
||||||
vim-moonfly #color scheme
|
gitsigns-nvim #in buffer git blame
|
||||||
lightline-vim #bottom bar
|
vim-moonfly #color scheme
|
||||||
];
|
lightline-vim #bottom bar
|
||||||
extraConfig = let
|
];
|
||||||
luaRequire = module:
|
extraConfig =
|
||||||
builtins.readFile (builtins.toString
|
let
|
||||||
./config
|
luaRequire = module:
|
||||||
|
builtins.readFile (builtins.toString
|
||||||
|
./config
|
||||||
+ "/${module}.lua");
|
+ "/${module}.lua");
|
||||||
luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
|
luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
|
||||||
"init"
|
"init"
|
||||||
"lspconfig"
|
"lspconfig"
|
||||||
"nvim-cmp"
|
"nvim-cmp"
|
||||||
]);
|
]);
|
||||||
in ''
|
in
|
||||||
lua << EOF
|
''
|
||||||
${luaConfig}
|
lua << EOF
|
||||||
EOF
|
${luaConfig}
|
||||||
|
EOF
|
||||||
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
{pkgs , ... }:
|
|
||||||
{
|
{
|
||||||
services.polybar = {
|
services.polybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.polybarFull;
|
package = pkgs.polybarFull;
|
||||||
script = "polybar left & \n polybar middle & \n polybar right &";
|
script = "polybar left & \n polybar middle & \n polybar right &";
|
||||||
settings = {
|
settings = {
|
||||||
"settings" = {
|
"settings" = {
|
||||||
screenchange.reload = true;
|
screenchange.reload = true;
|
||||||
pseudo.transparency =false;
|
pseudo.transparency = false;
|
||||||
};
|
};
|
||||||
"colors" = {
|
"colors" = {
|
||||||
background = "#000000";
|
background = "#000000";
|
||||||
|
|
@ -37,7 +36,7 @@
|
||||||
fixed.center = false;
|
fixed.center = false;
|
||||||
dpi = 96;
|
dpi = 96;
|
||||||
offset.y = 10;
|
offset.y = 10;
|
||||||
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
|
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
|
||||||
background = "\${colors.background}";
|
background = "\${colors.background}";
|
||||||
foreground = "\${colors.foreground}";
|
foreground = "\${colors.foreground}";
|
||||||
line.size = "3pt";
|
line.size = "3pt";
|
||||||
|
|
@ -79,7 +78,7 @@
|
||||||
fixed.center = false;
|
fixed.center = false;
|
||||||
dpi = 96;
|
dpi = 96;
|
||||||
offset.y = 10;
|
offset.y = 10;
|
||||||
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
|
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
|
||||||
background = "\${colors.background}";
|
background = "\${colors.background}";
|
||||||
foreground = "\${colors.foreground}";
|
foreground = "\${colors.foreground}";
|
||||||
line.size = "3pt";
|
line.size = "3pt";
|
||||||
|
|
@ -134,7 +133,7 @@
|
||||||
background = "\${colors.background}";
|
background = "\${colors.background}";
|
||||||
padding = 2;
|
padding = 2;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"module/date" = {
|
"module/date" = {
|
||||||
type = "internal/date";
|
type = "internal/date";
|
||||||
|
|
@ -167,14 +166,14 @@
|
||||||
unknown.as.up = true;
|
unknown.as.up = true;
|
||||||
format = {
|
format = {
|
||||||
connected = "\"%{A1:networkmanager_dmenu:}<ramp-signal>%{A}\"";
|
connected = "\"%{A1:networkmanager_dmenu:}<ramp-signal>%{A}\"";
|
||||||
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
|
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
|
||||||
};
|
};
|
||||||
label.disconnected = {
|
label.disconnected = {
|
||||||
text = "";
|
text = "";
|
||||||
padding = 0;
|
padding = 0;
|
||||||
};
|
};
|
||||||
ramp.signal = {
|
ramp.signal = {
|
||||||
text = ["" "" "" "" ""];
|
text = [ "" "" "" "" "" ];
|
||||||
foreground = "\${colors.foreground}";
|
foreground = "\${colors.foreground}";
|
||||||
background = "\${colors.background}";
|
background = "\${colors.background}";
|
||||||
padding = 1;
|
padding = 1;
|
||||||
|
|
@ -189,7 +188,7 @@
|
||||||
unknown.as.up = true;
|
unknown.as.up = true;
|
||||||
format = {
|
format = {
|
||||||
connected = "\"%{A1:networkmanager_dmenu:}<label-connected>%{A}\"";
|
connected = "\"%{A1:networkmanager_dmenu:}<label-connected>%{A}\"";
|
||||||
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
|
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
|
||||||
};
|
};
|
||||||
label.connected = {
|
label.connected = {
|
||||||
text = "";
|
text = "";
|
||||||
|
|
@ -215,8 +214,8 @@
|
||||||
type = "internal/battery";
|
type = "internal/battery";
|
||||||
full.at = 100;
|
full.at = 100;
|
||||||
low.at = 20;
|
low.at = 20;
|
||||||
# battery = "BAT0";
|
# battery = "BAT0";
|
||||||
# adapter = "ACAD";
|
# adapter = "ACAD";
|
||||||
poll.interval = 5;
|
poll.interval = 5;
|
||||||
format = {
|
format = {
|
||||||
charging = "\"%{A1:xfce4-power-menu -c:}<animation-charging>%{A}\"";
|
charging = "\"%{A1:xfce4-power-menu -c:}<animation-charging>%{A}\"";
|
||||||
|
|
@ -249,13 +248,13 @@
|
||||||
low = {
|
low = {
|
||||||
text = [ " " " " ];
|
text = [ " " " " ];
|
||||||
framerate = 200;
|
framerate = 200;
|
||||||
foreground = "\${colors.alert}";
|
foreground = "\${colors.alert}";
|
||||||
background = "\${colors.background}";
|
background = "\${colors.background}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
ramp.capacity = {
|
ramp.capacity = {
|
||||||
text = [ " " " " " " " " " " ];
|
text = [ " " " " " " " " " " ];
|
||||||
background = "\${colors.background}";
|
background = "\${colors.background}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"module/pulseaudio" = {
|
"module/pulseaudio" = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{config, pkgs, ...}:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./theme.nix
|
./theme.nix
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
"XF86AudioPause" = "playerctl play-pause";
|
"XF86AudioPause" = "playerctl play-pause";
|
||||||
"XF86AudioStop" = "playerctl stop";
|
"XF86AudioStop" = "playerctl stop";
|
||||||
"XF86AudioNext" = "playerctl next";
|
"XF86AudioNext" = "playerctl next";
|
||||||
"XF86AudioPrev" = "playerctl previous";
|
"XF86AudioPrev" = "playerctl previous";
|
||||||
"XF86AudioRaiseVolume" = "amixer sset Master 40+";
|
"XF86AudioRaiseVolume" = "amixer sset Master 40+";
|
||||||
"XF86AudioLowerVolume" = "amixer sset Master 40-";
|
"XF86AudioLowerVolume" = "amixer sset Master 40-";
|
||||||
"XF86AudioMute" = "amixer sset Master toggle ";
|
"XF86AudioMute" = "amixer sset Master toggle ";
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
fonts = {
|
fonts = {
|
||||||
fonts = with pkgs; [overpass nerdfonts-overpass material-design-icons];
|
fonts = with pkgs; [ overpass nerdfonts-overpass material-design-icons ];
|
||||||
fontconfig = {
|
fontconfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultFonts = {
|
defaultFonts = {
|
||||||
serif = ["Overpass" "Overpass Nerd Font" "Material Design Icons"];
|
serif = [ "Overpass" "Overpass Nerd Font" "Material Design Icons" ];
|
||||||
sansSerif = ["Overpass" "Overpass Nerd Font" "Material Design Icons"];
|
sansSerif = [ "Overpass" "Overpass Nerd Font" "Material Design Icons" ];
|
||||||
monospace = ["Overpass Mono" "OverpassMono Nerd Font" "Material Design Icons" ];
|
monospace = [ "Overpass Mono" "OverpassMono Nerd Font" "Material Design Icons" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ config, pkgs, callPackage, ... }:
|
{ config, pkgs, callPackage, ... }:
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
bottom #view tasks
|
bottom #view tasks
|
||||||
efibootmgr #efi editor
|
efibootmgr #efi editor
|
||||||
maim #screenshooter
|
maim #screenshooter
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
pcmanfm #file manager
|
pcmanfm #file manager
|
||||||
haskellPackages.squeeze #file compression
|
haskellPackages.squeeze #file compression
|
||||||
nix-tree #view packages
|
nix-tree #view packages
|
||||||
docker
|
];
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,26 @@
|
||||||
{
|
{
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
xrandrHeads = [
|
xrandrHeads = [
|
||||||
{
|
{
|
||||||
output = "HDMI-0";
|
output = "HDMI-0";
|
||||||
primary = true;
|
primary = true;
|
||||||
monitorConfig = ''
|
monitorConfig = ''
|
||||||
Option "DPMS" "false"
|
Option "DPMS" "false"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
screenSection = ''
|
screenSection = ''
|
||||||
Option "metamodes" "1920x1080_144 +0+0"
|
Option "metamodes" "1920x1080_144 +0+0"
|
||||||
'';
|
'';
|
||||||
monitorSection = ''
|
monitorSection = ''
|
||||||
Option "DPMS" "false"
|
Option "DPMS" "false"
|
||||||
'';
|
'';
|
||||||
serverFlagsSection = ''
|
serverFlagsSection = ''
|
||||||
Option "BlankTime" "0"
|
Option "BlankTime" "0"
|
||||||
Option "StandbyTime" "0"
|
Option "StandbyTime" "0"
|
||||||
Option "SuspendTime" "0"
|
Option "SuspendTime" "0"
|
||||||
Option "OffTime" "0"
|
Option "OffTime" "0"
|
||||||
Option "DPMS" "false"
|
Option "DPMS" "false"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ let
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
nix flake update /etc/nixos/#
|
nix flake update /etc/nixos/#
|
||||||
'';
|
'';
|
||||||
|
|
||||||
clean-store = pkgs.writeShellScriptBin "clean-store" ''
|
clean-store = pkgs.writeShellScriptBin "clean-store" ''
|
||||||
if ! [ $(id -u) = 0 ]; then
|
if ! [ $(id -u) = 0 ]; then
|
||||||
|
|
@ -16,7 +16,7 @@ let
|
||||||
fi
|
fi
|
||||||
rm /nix/var/nix/gcroots/auto/*
|
rm /nix/var/nix/gcroots/auto/*
|
||||||
nix-collect-garbage -d
|
nix-collect-garbage -d
|
||||||
'';
|
'';
|
||||||
|
|
||||||
apply-system = pkgs.writeShellScriptBin "apply-system" ''
|
apply-system = pkgs.writeShellScriptBin "apply-system" ''
|
||||||
if ! [ $(id -u) = 0 ]; then
|
if ! [ $(id -u) = 0 ]; then
|
||||||
|
|
@ -24,7 +24,7 @@ let
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
nixos-rebuild switch --flake /etc/nixos/#
|
nixos-rebuild switch --flake /etc/nixos/#
|
||||||
'';
|
'';
|
||||||
|
|
||||||
full-upgrade = pkgs.writeShellScriptBin "full-upgrade" ''
|
full-upgrade = pkgs.writeShellScriptBin "full-upgrade" ''
|
||||||
if ! [ $(id -u) = 0 ]; then
|
if ! [ $(id -u) = 0 ]; then
|
||||||
|
|
@ -35,16 +35,10 @@ let
|
||||||
apply-system
|
apply-system
|
||||||
'';
|
'';
|
||||||
|
|
||||||
polybar-tray = pkgs.writeShellScriptBin "polybar-tray" ''
|
|
||||||
u=$(xprop -name "Polybar tray window" _NET_WM_PID | awk '{print $3}')
|
|
||||||
if [ $u -Z ]
|
|
||||||
then polybar tray &
|
|
||||||
else kill $u
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
pastebin = pkgs.writeShellScriptBin "pastebin" ''
|
pastebin = pkgs.writeShellScriptBin "pastebin" ''
|
||||||
curl -F 'clbin=<-' https://clbin.com
|
curl -F 'clbin=<-' https://clbin.com
|
||||||
'';
|
'';
|
||||||
in {
|
in
|
||||||
environment.systemPackages = [ update-system clean-store apply-system polybar-tray full-upgrade pastebin];
|
{
|
||||||
|
environment.systemPackages = [ update-system apply-system full-upgrade clean-store pastebin ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
{username, ...}:
|
{ username, ... }:
|
||||||
{
|
{
|
||||||
services.samba-wsdd.enable = true; # make shares visible for windows 10 clients
|
services.samba-wsdd.enable = true; # make shares visible for windows 10 clients
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
allowedTCPPorts = [ 139 445 ];
|
allowedTCPPorts = [ 139 445 ];
|
||||||
allowedUDPPorts = [ 137 138 ];
|
allowedUDPPorts = [ 137 138 ];
|
||||||
};
|
};
|
||||||
services.samba = {
|
services.samba = {
|
||||||
enable = true;
|
enable = true;
|
||||||
securityType = "user";
|
securityType = "user";
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
kernelModules = [ "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" ];
|
kernelModules = [ "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" ];
|
||||||
initrd.kernelModules = [ "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" ];
|
initrd.kernelModules = [ "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" ];
|
||||||
extraModprobeConfig = ''
|
extraModprobeConfig = ''
|
||||||
options vfio-pci ids=10de:228e,10de:2504
|
options vfio-pci ids=10de:228e,10de:2504
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
|
|
@ -15,41 +15,43 @@
|
||||||
runAsRoot = true;
|
runAsRoot = true;
|
||||||
ovmf.enable = true;
|
ovmf.enable = true;
|
||||||
verbatimConfig = ''
|
verbatimConfig = ''
|
||||||
user = "${username}"
|
user = "${username}"
|
||||||
group = "kvm"
|
group = "kvm"
|
||||||
namespaces = []
|
namespaces = []
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
environment.systemPackages = with pkgs; [ virt-manager ];
|
environment.systemPackages = with pkgs; [ virt-manager ];
|
||||||
systemd.services.libvirtd.preStart = let
|
systemd.services.libvirtd.preStart =
|
||||||
qemuHook = pkgs.writeScript "qemu-hook" ''
|
let
|
||||||
#!${pkgs.stdenv.shell}
|
qemuHook = pkgs.writeScript "qemu-hook" ''
|
||||||
|
#!${pkgs.stdenv.shell}
|
||||||
|
|
||||||
GUEST_NAME="$1"
|
GUEST_NAME="$1"
|
||||||
OPERATION="$2"
|
OPERATION="$2"
|
||||||
SUB_OPERATION="$3"
|
SUB_OPERATION="$3"
|
||||||
|
|
||||||
if [ "$GUEST_NAME" == "Windows" ]; then
|
if [ "$GUEST_NAME" == "Windows" ]; then
|
||||||
if [ "$OPERATION" == "start" ]; then
|
if [ "$OPERATION" == "start" ]; then
|
||||||
systemctl set-property --runtime -- user.slice AllowedCPUs=8-15,24-31
|
systemctl set-property --runtime -- user.slice AllowedCPUs=8-15,24-31
|
||||||
systemctl set-property --runtime -- system.slice AllowedCPUs=8-15,24-31
|
systemctl set-property --runtime -- system.slice AllowedCPUs=8-15,24-31
|
||||||
systemctl set-property --runtime -- init.scope AllowedCPUs=8-15,24-31
|
systemctl set-property --runtime -- init.scope AllowedCPUs=8-15,24-31
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$OPERATION" == "stopped" ]; then
|
||||||
|
systemctl set-property --runtime -- user.slice AllowedCPUs=0-31
|
||||||
|
systemctl set-property --runtime -- system.slice AllowedCPUs=0-31
|
||||||
|
systemctl set-property --runtime -- init.scope AllowedCPUs=0-31
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
''
|
||||||
|
mkdir -p /var/lib/libvirt/hooks
|
||||||
|
chmod 755 /var/lib/libvirt/hooks
|
||||||
|
|
||||||
if [ "$OPERATION" == "stopped" ]; then
|
# Copy hook files
|
||||||
systemctl set-property --runtime -- user.slice AllowedCPUs=0-31
|
ln -sf ${qemuHook} /var/lib/libvirt/hooks/qemu
|
||||||
systemctl set-property --runtime -- system.slice AllowedCPUs=0-31
|
|
||||||
systemctl set-property --runtime -- init.scope AllowedCPUs=0-31
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
'';
|
'';
|
||||||
in ''
|
|
||||||
mkdir -p /var/lib/libvirt/hooks
|
|
||||||
chmod 755 /var/lib/libvirt/hooks
|
|
||||||
|
|
||||||
# Copy hook files
|
|
||||||
ln -sf ${qemuHook} /var/lib/libvirt/hooks/qemu
|
|
||||||
'';
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
{config, pkgs, username, ... }:
|
{ config, pkgs, username, ... }:
|
||||||
{
|
{
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
videoDrivers =
|
videoDrivers =
|
||||||
if (config.networking.hostName == "gerg-laptop")
|
if (config.networking.hostName == "gerg-laptop")
|
||||||
then ["modesetting" "nvidia"]
|
then [ "modesetting" "nvidia" ]
|
||||||
else [ "amdgpu" ];
|
else [ "amdgpu" ];
|
||||||
layout = "us";
|
layout = "us";
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
|
|
@ -18,47 +18,47 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
greeters.mini = {
|
greeters.mini = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
[greeter]
|
[greeter]
|
||||||
user = ${username}
|
user = ${username}
|
||||||
show-password-label = false
|
show-password-label = false
|
||||||
password-label-text =
|
password-label-text =
|
||||||
invalid-password-text =
|
invalid-password-text =
|
||||||
show-input-cursor = false
|
show-input-cursor = false
|
||||||
password-alignment = center
|
password-alignment = center
|
||||||
password-input-width = 19
|
password-input-width = 19
|
||||||
show-image-on-all-monitors = true
|
show-image-on-all-monitors = true
|
||||||
|
|
||||||
|
|
||||||
[greeter-hotkeys]
|
[greeter-hotkeys]
|
||||||
mod-key = meta
|
mod-key = meta
|
||||||
shutdown-key = s
|
shutdown-key = s
|
||||||
restart-key = r
|
restart-key = r
|
||||||
hibernate-key = h
|
hibernate-key = h
|
||||||
suspend-key = u
|
suspend-key = u
|
||||||
|
|
||||||
|
|
||||||
[greeter-theme]
|
[greeter-theme]
|
||||||
font = "OverpassMono Nerd Font"
|
font = "OverpassMono Nerd Font"
|
||||||
font-size = 1.1em
|
font-size = 1.1em
|
||||||
font-weight = bold
|
font-weight = bold
|
||||||
font-style = normal
|
font-style = normal
|
||||||
text-color = "#7AA2F7"
|
text-color = "#7AA2F7"
|
||||||
error-color = "#DB4B4B"
|
error-color = "#DB4B4B"
|
||||||
background-image = "/etc/nixos/images/nix-stars.png"
|
background-image = "/etc/nixos/images/nix-stars.png"
|
||||||
background-color = "#000000"
|
background-color = "#000000"
|
||||||
window-color = "#000000"
|
window-color = "#000000"
|
||||||
border-color = "#000000"
|
border-color = "#000000"
|
||||||
border-width = 2px
|
border-width = 2px
|
||||||
layout-space = 15
|
layout-space = 15
|
||||||
password-character = -1
|
password-character = -1
|
||||||
password-color = "#7AA2F7"
|
password-color = "#7AA2F7"
|
||||||
password-background-color = "#24283B"
|
password-background-color = "#24283B"
|
||||||
password-border-color = "#000000"
|
password-border-color = "#000000"
|
||||||
password-border-width = 2px
|
password-border-width = 2px
|
||||||
password-border-radius = 0.341125em
|
password-border-radius = 0.341125em
|
||||||
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
add_newline = false;
|
add_newline = false;
|
||||||
format="$sudo \n $directory$git_branch$character";
|
format = "$sudo \n $directory$git_branch$character";
|
||||||
character = {
|
character = {
|
||||||
success_symbol = "[ ](#9ece6a bold)";
|
success_symbol = "[ ](#9ece6a bold)";
|
||||||
error_symbol = "[ ](#db4b4b bold)";
|
error_symbol = "[ ](#db4b4b bold)";
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
git_branch = {
|
git_branch = {
|
||||||
style = "bold red";
|
style = "bold red";
|
||||||
};
|
};
|
||||||
sudo ={
|
sudo = {
|
||||||
format = "[ ](#7aa2f7)";
|
format = "[ ](#7aa2f7)";
|
||||||
disabled = false;
|
disabled = false;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> { };
|
||||||
in
|
in
|
||||||
with pkgs;
|
with pkgs;
|
||||||
mkShell rec {
|
mkShell rec {
|
||||||
|
|
|
||||||
|
|
@ -15,20 +15,20 @@
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "afk-cmds";
|
pname = "afk-cmds";
|
||||||
version= "1.0.0";
|
version = "1.0.0";
|
||||||
|
|
||||||
src = ./afk-cmds;
|
src = ./afk-cmds;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libX11
|
libX11
|
||||||
libXScrnSaver
|
libXScrnSaver
|
||||||
cairo
|
cairo
|
||||||
glib
|
glib
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
gtkmm3
|
gtkmm3
|
||||||
pango
|
pango
|
||||||
libappindicator-gtk3
|
libappindicator-gtk3
|
||||||
atk
|
atk
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -8,15 +8,15 @@
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "parrot";
|
pname = "parrot";
|
||||||
version= "1.4.2";
|
version = "1.4.2";
|
||||||
# buildFeatures = ["let_else"];
|
# buildFeatures = ["let_else"];
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aquelemiguel";
|
owner = "aquelemiguel";
|
||||||
repo = "parrot";
|
repo = "parrot";
|
||||||
rev = "28d7db3c5b50c7ba01eec71a3177875feae44bcc";
|
rev = "28d7db3c5b50c7ba01eec71a3177875feae44bcc";
|
||||||
sha256 = "sha256-G9SfaiR/KIt+Xm7vLs/EGaImZeSaUbpgAArfK6oVJeM=";
|
sha256 = "sha256-G9SfaiR/KIt+Xm7vLs/EGaImZeSaUbpgAArfK6oVJeM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
yt-dlp
|
yt-dlp
|
||||||
openssl
|
openssl
|
||||||
|
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
cmake
|
cmake
|
||||||
];
|
];
|
||||||
cargoSha256 = "sha256-ScwyPTq9da0hst/b2FX89SP03OX3HrJT3oUKGsHEjgs=";
|
cargoSha256 = "sha256-ScwyPTq9da0hst/b2FX89SP03OX3HrJT3oUKGsHEjgs=";
|
||||||
|
|
||||||
RUSTC_BOOTSTRAP = 1;
|
RUSTC_BOOTSTRAP = 1;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,13 @@
|
||||||
, fetchzip
|
, fetchzip
|
||||||
, glibc
|
, glibc
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
wrapper = ''
|
wrapper = ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
export LD_LIBRARY_PATH=${stdenv.cc.cc.lib}/lib/:${glibc}/lib/:/run/opengl-driver/lib/
|
export LD_LIBRARY_PATH=${stdenv.cc.cc.lib}/lib/:${glibc}/lib/:/run/opengl-driver/lib/
|
||||||
exec ${glibc}/lib64/ld-linux-x86-64.so.2 \
|
exec ${glibc}/lib64/ld-linux-x86-64.so.2 \
|
||||||
$out/t-rex --no-watchdog \$@
|
$out/t-rex --no-watchdog \$@
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "t-rex-miner";
|
pname = "t-rex-miner";
|
||||||
|
|
@ -20,19 +20,19 @@ stdenv.mkDerivation rec {
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dm555 $src/t-rex $out/t-rex
|
install -Dm555 $src/t-rex $out/t-rex
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
touch $out/bin/t-rex
|
touch $out/bin/t-rex
|
||||||
echo "${wrapper}" > $out/bin/t-rex
|
echo "${wrapper}" > $out/bin/t-rex
|
||||||
chmod +x $out/bin/t-rex
|
chmod +x $out/bin/t-rex
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/ISnortPennies/AFKCommands";
|
homepage = "https://github.com/ISnortPennies/AFKCommands";
|
||||||
description = "";
|
description = "";
|
||||||
license = licenses.unlicense;
|
license = licenses.unlicense;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
(final: super: rec {
|
(final: super: rec {
|
||||||
st = (super.st.override { extraLibs = with super; [ xorg.libXcursor harfbuzz ];
|
st = (super.st.override {
|
||||||
}).overrideAttrs (oldAttrs: rec {
|
extraLibs = with super; [ xorg.libXcursor harfbuzz ];
|
||||||
src = ./st;
|
}).overrideAttrs (oldAttrs: rec {
|
||||||
|
src = ./st;
|
||||||
|
});
|
||||||
|
dwm = (super.dwm.override { }).overrideAttrs (oldAttrs: rec {
|
||||||
|
src = ./dwm;
|
||||||
});
|
});
|
||||||
dwm = (super.dwm.override {}).overrideAttrs (oldAttrs: rec {
|
|
||||||
src = ./dwm;
|
|
||||||
});
|
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> { };
|
||||||
in
|
in
|
||||||
with pkgs;
|
with pkgs;
|
||||||
mkShell rec {
|
mkShell rec {
|
||||||
|
|
@ -9,7 +9,7 @@ mkShell rec {
|
||||||
xorg.libXft
|
xorg.libXft
|
||||||
xorg.libXcursor
|
xorg.libXcursor
|
||||||
];
|
];
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
ncurses
|
ncurses
|
||||||
fontconfig
|
fontconfig
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ config, pkgs, callPackage, lib, username, ... }:
|
{ config, pkgs, callPackage, lib, username, ... }:
|
||||||
{
|
{
|
||||||
#important stuff first
|
#important stuff first
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
../modules/amd.nix
|
../modules/amd.nix
|
||||||
|
|
@ -16,15 +16,15 @@
|
||||||
];
|
];
|
||||||
networking.hostName = "gerg-desktop";
|
networking.hostName = "gerg-desktop";
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
hardware.cpu.amd.updateMicrocode = true;
|
hardware.cpu.amd.updateMicrocode = true;
|
||||||
#end important stuff
|
#end important stuff
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
#afk-cmds
|
#afk-cmds
|
||||||
xmrig
|
xmrig
|
||||||
t-rex-miner
|
t-rex-miner
|
||||||
vscodium
|
vscodium
|
||||||
];
|
];
|
||||||
#user managment
|
#user managment
|
||||||
users = {
|
users = {
|
||||||
defaultUserShell = pkgs.zsh;
|
defaultUserShell = pkgs.zsh;
|
||||||
users."${username}" = {
|
users."${username}" = {
|
||||||
|
|
@ -34,12 +34,12 @@
|
||||||
};
|
};
|
||||||
boot = {
|
boot = {
|
||||||
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ];
|
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ];
|
||||||
kernelModules = [ "kvm-amd" "msr"];
|
kernelModules = [ "kvm-amd" "msr" ];
|
||||||
kernelParams = [ "iomem=relaxed" "msr.allow_writes=on" ];
|
kernelParams = [ "iomem=relaxed" "msr.allow_writes=on" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" ={
|
"/" = {
|
||||||
device = "/dev/disk/by-uuid/e5c9634f-0273-4fd3-b35f-49899984340f";
|
device = "/dev/disk/by-uuid/e5c9634f-0273-4fd3-b35f-49899984340f";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
@ -52,18 +52,18 @@
|
||||||
#mining stuff
|
#mining stuff
|
||||||
systemd.services.mining = {
|
systemd.services.mining = {
|
||||||
enable = false;
|
enable = false;
|
||||||
path = with pkgs; [t-rex-miner afk-cmds st zsh dbus xmrig];
|
path = with pkgs; [ t-rex-miner afk-cmds st zsh dbus xmrig ];
|
||||||
wantedBy = [ "graphical.target" ];
|
wantedBy = [ "graphical.target" ];
|
||||||
script = ''
|
script = ''
|
||||||
afk-cmds -c /home/gerg/afk-cmds.json
|
afk-cmds -c /home/${username}/afk-cmds.json
|
||||||
'';
|
'';
|
||||||
environment = {
|
environment = {
|
||||||
# PATH="/run/current-system/sw/bin"; missing something with dbus
|
# PATH="/run/current-system/sw/bin"; missing something with dbus
|
||||||
XAUTHORITY="/home/${username}/.Xauthority";
|
XAUTHORITY = "/home/${username}/.Xauthority";
|
||||||
DISPLAY=":0";
|
DISPLAY = ":0";
|
||||||
XDG_DATA_DIRS="/nix/var/nix/profiles/default/share:/run/current-system/sw/share";
|
XDG_DATA_DIRS = "/nix/var/nix/profiles/default/share:/run/current-system/sw/share";
|
||||||
DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1000/bus";
|
DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/1000/bus";
|
||||||
NO_AT_BRIDGE="1";
|
NO_AT_BRIDGE = "1";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, callPackage, lib, ... }:
|
{ config, pkgs, callPackage, lib, username, ... }:
|
||||||
{
|
{
|
||||||
#important stuff first
|
#important stuff first
|
||||||
imports =
|
imports =
|
||||||
|
|
@ -14,18 +14,18 @@
|
||||||
];
|
];
|
||||||
networking.hostName = "gerg-laptop";
|
networking.hostName = "gerg-laptop";
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
hardware.cpu.amd.updateMicrocode = true;
|
hardware.cpu.amd.updateMicrocode = true;
|
||||||
|
|
||||||
# end important stuff
|
# end important stuff
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
xorg.xf86videoamdgpu
|
xorg.xf86videoamdgpu
|
||||||
];
|
];
|
||||||
# user managment
|
# user managment
|
||||||
users = {
|
users = {
|
||||||
defaultUserShell = pkgs.zsh;
|
defaultUserShell = pkgs.zsh;
|
||||||
users.gerg = {
|
users."${username}" = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "audio" "networkmanager"];
|
extraGroups = [ "wheel" "audio" "networkmanager" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
boot = {
|
boot = {
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
kernelModules = [ "kvm-amd" ];
|
kernelModules = [ "kvm-amd" ];
|
||||||
};
|
};
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
device = "/dev/disk/by-uuid/c67796b3-d502-47db-8d0e-48f30bc91041";
|
device = "/dev/disk/by-uuid/c67796b3-d502-47db-8d0e-48f30bc91041";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue