varris
/
nixos-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Varris 2022-08-08 11:01:42 +02:00
parent cfb7366b7c
commit 20facf173e
7 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flake.nix
View File

@ -9,11 +9,26 @@
nur.url = "github:nix-community/NUR";
nur.inputs.nixpkgs.follows = "nixpkgs";
# Kakoune Plugins
kakoune-smarttab.url = "github:andreyorst/smarttab.kak";
kakoune-smarttab.flake = false;
kakoune-auto-pairs.url = "github:alexherbo2/auto-pairs.kak";
kakoune-auto-pairs.flake = false;
kakoune-sort-selections.url = "github:occivink/kakoune-sort-selections";
kakoune-sort-selections.flake = false;
# Kakoune Plugins End
rofi-theme.url = "github:bardisty/gruvbox-rofi";
rofi-theme.flake = false;
};
outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }:
let
username = "manuel";
hostname = "terra";
system = "x86_64-linux";
@ -32,9 +47,13 @@
"JetBrainsMono"
];
};
discord = prev.discord.override {
nss = pkgs.nss_latest;
withOpenASAR = true;
};
});
nixosConfigurations.terra = nixpkgs.lib.nixosSystem
nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem
{
inherit system;
specialArgs = { inherit inputs; };

5
system/configuration.nix
View File

@ -34,8 +34,7 @@
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
#keyMap = "us-intl";
useXkbConfig = true; # use xkbOptions in tty.
keyMap = "us-acentos";
};
hardware.opengl = {
@ -121,9 +120,9 @@
services.gnome.gnome-keyring.enable = true;
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-wlr
];
};

26
system/hardware-configuration.nix
View File

@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
@ -14,41 +15,46 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
{
device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
fsType = "btrfs";
options = [ "subvol=@nixos-root" "compress-force=zstd" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1AC9-E1AD";
{
device = "/dev/disk/by-uuid/1AC9-E1AD";
fsType = "vfat";
};
fileSystems."/mnt/btrfs" =
{ device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
{
device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
fsType = "btrfs";
options = [ "subvol=@nixos-root" ];
options = [ "subvol=/" ];
};
fileSystems."/mnt/hdd" =
{ device = "/dev/disk/by-uuid/beccaf7e-9c7e-4c04-959b-52f1e0375491";
{
device = "/dev/disk/by-uuid/beccaf7e-9c7e-4c04-959b-52f1e0375491";
fsType = "ext4";
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/d94babc9-ef09-43bb-949d-ed477ff4f4c2";
{
device = "/dev/disk/by-uuid/d94babc9-ef09-43bb-949d-ed477ff4f4c2";
fsType = "ext4";
};
fileSystems."/opt/games" =
{ device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
{
device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
fsType = "btrfs";
options = [ "subvol=@steamgames" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/b7ec8c05-2a36-4b35-99fc-866e97c6330b"; }
];
[{ device = "/dev/disk/by-uuid/b7ec8c05-2a36-4b35-99fc-866e97c6330b"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

3
user/configs/fish/fish.nix
View File

@ -35,7 +35,7 @@
nor = ''
pushd &> /dev/null
cd "${config.home.homeDirectory}/.dotfiles"
doas nixos-rebuild switch --upgrade --flake .#
doas nixos-rebuild switch --flake .#
popd &> /dev/null
'';
@ -48,7 +48,6 @@
'';
};
shellAliases = {
hm = "home-manager";
nf = "${pkgs.neofetch}/bin/neofetch";
};
};

30
user/configs/kakoune/kakoune.nix
View File

@ -1,32 +1,19 @@
{ config, pkgs, lib, ... }:
{ config, pkgs, lib, inputs, ... }:
let
smarttab = pkgs.kakouneUtils.buildKakounePlugin {
name = "smarttab-kak";
src = pkgs.fetchFromGitHub {
owner = "andreyorst";
repo = "smarttab.kak";
rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e";
sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9";
};
name = "kakoune-smarttab";
src = inputs.kakoune-smarttab;
};
auto-pairs = pkgs.kakouneUtils.buildKakounePlugin {
name = "auto-pairs-kak";
src = pkgs.fetchFromGitHub {
owner = "alexherbo2";
repo = "auto-pairs.kak";
rev = "bfdcb8566076f653ec707f86207f83ea75173ce9";
sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij";
};
name = "kakoune-auto-pairs";
src = inputs.kakoune-auto-pairs;
};
sort-selections = pkgs.kakouneUtils.buildKakounePlugin {
name = "sort-selections-kak";
src = pkgs.fetchFromGitHub {
owner = "occivink";
repo = "kakoune-sort-selections";
rev = "fdc03616b83140d3657f971dbc914269f9c8f1ff";
sha256 = "P0uyuKQ//QqzOHs920gggXUKyWoMeAWn7XnlOQazHbc=";
};
src = inputs.kakoune-sort-selections;
};
in
{
programs.kakoune = {
@ -80,3 +67,4 @@ in
pkgs.rnix-lsp
];
}

14
user/configs/sway/sway.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ config, pkgs, lib, inputs, ... }:
let
wobsock = "/tmp/wob-swayvol.fifo";
wallpaper = "/mnt/hdd/Wallpapers/gruv-4.jpg";
@ -45,13 +45,7 @@ let
echo "Xwayland: $DSP - Primary monitor set"
'';
rofi-theme = pkgs.fetchFromGitHub
{
owner = "bardisty";
repo = "gruvbox-rofi";
rev = "0b4cf703087e2150968826b7508cf119437eba7a";
sha256 = "nAVNtibzVhv1wBcAo36jvHbsN7spFYjjm3IhcAeoM6M=";
} + "/gruvbox-dark.rasi";
rofi-theme = inputs.rofi-theme + "/gruvbox-dark.rasi";
killprocess = pkgs.writeShellScriptBin "killprocess.sh"
''
@ -91,6 +85,7 @@ in
"${modifier}+Shift+o" = "exec ${killprocess}/bin/killprocess.sh";
"${modifier}+q" = "exec ${pkgs.firefox}/bin/firefox";
"${modifier}+r" = "exec ${pkgs.xfce.thunar}/bin/thunar";
"Ctrl+Space" = "exec ${pkgs.mako}/bin/makoctl dismiss";
"Ctrl+grave" = "exec ${pkgs.mako}/bin/makoctl restore";
@ -176,6 +171,9 @@ in
extraSessionCommands = ''
export MOZ_ENABLE_WAYLAND=1
'';
wrapperFeatures = {
gtk = true;
};
};
programs.mako = {

15
user/home.nix
View File

@ -27,6 +27,7 @@
pkgs.pavucontrol
pkgs.polymc
pkgs.steam
pkgs.steam-run
pkgs.thunderbird
pkgs.twemoji-color-font
pkgs.xivlauncher
@ -59,7 +60,7 @@
enable = true;
theme = {
package = pkgs.gruvbox-dark-gtk;
name = "gruvbox-dark-gtk";
name = "gruvbox-dark";
};
font = {
name = "JetBrainsMono Nerd Font";
@ -88,10 +89,15 @@
enableFishIntegration = true;
};
services.gnome-keyring.enable = true;
xdg.userDirs = {
enable = true;
createDirectories = true;
music = "/mnt/hdd/Music";
download = "/mnt/hdd/Downloads";
};
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
@ -101,6 +107,5 @@
# the Home Manager release notes for a list of state version
# changes in each release.
home.stateVersion = "22.05";
nixpkgs.config.allowUnfree = true;
}