From 34f3b9d4de748946168fd3d78f5a8a963bf44f2a Mon Sep 17 00:00:00 2001 From: Daan Vanoverloop Date: Sat, 1 Jul 2023 08:14:48 +0200 Subject: [PATCH] Update --- nixos/configuration.nix | 59 +++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 6f62e26..7bc19ea 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -13,29 +13,9 @@ in (import "${home-manager}/nixos") ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/d488d0d7-c1df-49b7-b713-2f6397bd86fb"; - fsType = "btrfs"; - options = [ "compress=zstd" "subvol=nixroot" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/d488d0d7-c1df-49b7-b713-2f6397bd86fb"; - fsType = "btrfs"; - options = [ "compress=zstd" "subvol=home" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/d488d0d7-c1df-49b7-b713-2f6397bd86fb"; - fsType = "btrfs"; - options = [ "compress=zstd" "noatime" "subvol=nix" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B0E9-D206"; - fsType = "vfat"; - }; - + fileSystems."/".options = [ "compress=zstd" ]; + fileSystems."/home".options = [ "compress=zstd" ]; + fileSystems."/nix".options = [ "compress=zstd" "noatime" ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; @@ -103,12 +83,12 @@ in #media-session.enable = true; }; - # Define a user account. Don't forget to set a password with ‘passwd’. + # Define a user account. Don't forget to set a password with 'passwd'. users.users.daan = { isNormalUser = true; description = "Daan Vanoverloop"; extraGroups = [ "networkmanager" "wheel" ]; - shell = pkgs.zsh; + # shell = pkgs.zsh; }; home-manager.users.daan = { pkgs, ... }: { @@ -117,8 +97,24 @@ in home.stateVersion = "23.05"; + imports = [ ./dconf.nix ./gnome.nix ]; + + home.sessionVariables = { GTK_THEME = "Adwaita:dark"; }; + programs.home-manager.enable = true; + programs.helix = { + enable = true; + settings = { + theme = "onedark"; + editor = { + line-number = "relative"; + cursor-shape.insert = "bar"; + soft-wrap.enable = true; + }; + }; + }; + programs.zsh = { enable = true; shellAliases = { @@ -129,6 +125,7 @@ in EDITOR = "hx"; TERM = "xterm-256color"; COLORTERM = "truecolor"; + NIX_BUILD_SHELL = "zsh"; }; oh-my-zsh = { enable = true; @@ -142,13 +139,19 @@ in home.packages = with pkgs; [ nil + jellyfin-media-player ]; }; # Allow unfree packages nixpkgs.config.allowUnfree = true; - programs.zsh.enable = true; + programs.kdeconnect = { + enable = true; + package = pkgs.gnomeExtensions.gsconnect; + }; + + # programs.zsh.enable = true; # List packages installed in system profile. To search, run: # $ nix search wget @@ -160,6 +163,10 @@ in openssh ]; + hardware.opengl.extraPackages = with pkgs; [ + intel-media-driver + ]; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true;