hm standalone again

This commit is contained in:
Bryan Ramos 2023-06-06 23:16:27 -04:00
parent a2c480f5d9
commit 2b0f6849b6
7 changed files with 38 additions and 63 deletions

18
flake.lock generated
View file

@ -56,27 +56,11 @@
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1686095819,
"narHash": "sha256-Z8Gas0gxUAiIQmFjaX41C74+NK5gVk424xsYEesMZQE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "59874cc9831e3891765e33d54ae9c0917f9de810",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": {
"inputs": {
"disko": "disko",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nur": "nur"
"nixpkgs": "nixpkgs"
}
}
},

View file

@ -4,42 +4,40 @@
inputs =
{
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
nur.url = "github:nix-community/NUR";
home-manager= {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, home-manager, disko, nur }:
outputs = { self, nixpkgs, home-manager, disko }:
let
system = "x86_64-linux";
overlays = [
(final: prev: {
nur = import nur {
inherit (prev) pkgs;
nurpkgs = nixpkgs.legacyPackages.x86_64-linux;
};
})
];
pkgs = import nixpkgs {
inherit system overlays;
inherit system;
config = {
allowUnfree = true;
};
};
in
{
nixosConfigurations.desktop = nixpkgs.lib.nixosSystem {
nixosConfigurations.socrates = nixpkgs.lib.nixosSystem {
inherit pkgs;
modules = [
./sysConfig/desktop
disko.nixosModules.disko
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.bryan = import ./homeConfig/home.nix;
}
];
};
homeConfigurations.bryan = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./homeConfig/home.nix
];
};
};

View file

@ -3,13 +3,6 @@
{
isDefault = true;
search.default = "Startpage";
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
ublock-origin
darkreader
keepassxc-browser
multi-account-containers
];
settings = {
"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
@ -17,7 +10,6 @@
"media.peerconnection.enabled" = false;
"browser.formfill.enable" = false;
"privacy.sanitize.sanitizeOnShutdown" = true;
"toolkit.telemetry.enabled" = false;
"toolkit.telemetry.archive.enabled" = false;
"datareporting.healthreport.uploadEnabled" = false;

View file

@ -1,9 +1,8 @@
{ pkgs, lib, config, ... }:
{ pkgs, config, ... }:
let
inherit (config.lib.formats.rasi) mkLiteral;
in
with lib;
{ enable = true;
package = pkgs.rofi-wayland;
location = "center";

View file

@ -8,10 +8,10 @@ in
xwayland = true;
wrapperFeatures.gtk = true;
extraOptions = [
"--unsupported-gpu"
"--my-next-gpu-wont-be-nvidia"
];
# extraOptions = [
# "--unsupported-gpu"
# "--my-next-gpu-wont-be-nvidia"
# ];
extraSessionCommands = ''
export _JAVA_AWT_WM_NONREPARENTING=1
@ -20,14 +20,14 @@ in
config = {
output = {
HDMI-A-1 = {
resolution = "190x1080";
resolution = "1920x1080";
position = "1920,0";
bg = "~/Pictures/wallpapers/mountains.jpg";
};
};
modifier = "Mod1";
menu = "\${pkgs.rofi-wayland}/bin/rofi -show drun -show-icons -drun-icon-theme Qogir -font 'Noto Sans 14'";
terminal = "\${pkgs.alacritty}/bin/alacritty";
menu = "rofi -show drun -show-icons -drun-icon-theme Qogir -font 'Noto Sans 14'";
terminal = "alacritty";
startup = [{ command = "exec { exec alacritty -e sh -c 'neofetch; exec $SHELL'"; always = true; }];
input = {

View file

@ -43,14 +43,15 @@
};
# GPU
services.xserver.videoDrivers = [ "nvidia" ];
hardware = {
opengl.enable = true;
nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.stable;
modesetting.enable = true;
};
};
hardware.nvidia.open = true;
# services.xserver.videoDrivers = [ "nvidia" ];
# hardware = {
# opengl.enable = true;
# nvidia = {
# package = config.boot.kernelPackages.nvidiaPackages.stable;
# modesetting.enable = true;
# };
# };
# Virtualisation
nix.settings.system-features = [ "kvm" ];

View file

@ -36,6 +36,7 @@
users.users.bryan = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "home-manager" "input" "video" "audio" "kvm" "libvirtd" "docker" ];
shell = pkgs.bash;
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDl4895aB9P5p/lp8Hq5rHun4clvhyTSHFi3U2d6OOBoW5Fm+VcQnW/xbjmCBsXk5BdiowsBxQhwnzdfz/KJL7J5RobomUEaVRwb9UwT88eJveLp14BG8j2J3SjfyhrCX+4jkPx0bPQk1HGcuYY+tPEXf1q/ps88Dhu0CARBIzYQOTYY6b1qWzxpDoFZGHjKG8g5iY6FIu65yKKvvVy1f8IgZ3l3IpwBWVamxgkTcYY0QYSrmzo1n7TXxwrWbvenAqBsQ0cBPs+gVa3uIr+1TJl0Az5SElBVGu3LvUdlk58trtPUj6TQR3YUkg7Vjll7WHOdqhux5ZQNhjkOsHerf0Tw86e6cEzgeTuIbQHIb0LcsUunwKcuh2+au7RO599cvHn0+xZE5MZBxloDDaJ3JsiliM8kyPP/U3ERj03cWLW7BqbT+sfjAOl21RCzk0iQxk1wt/8VmtCr9Adv7IyrtaYvf/bwRP+g+9ldmzKGt8Mdb605uVzZ70H/LLm17f40Te+QHaex5by/6p6cuwEEZtgIg53Wpglu0rA6UxrBfQEHKl/Jt3FLeE0mnEyYkkR2MnHNtyWRIXtuqYZMAm2Ub1pFHH7jQV1gGiDVTw6a2eIwK21a/hXtRjFUpFd1nB1n+KNfJBE4zT3wm3Ud7mKw/6rWnoRyhYZvGXkFdp+iEs49Q=="
];