fix(nixos): mirros fixes after upgrade system

Wittano · Dec 1, 2023 · fe8b28d · fe8b28d
1 parent b9f9a98
commit fe8b28d
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 51 deletions.
diff --git a/configuration.nix b/configuration.nix
@@ -69,21 +69,6 @@
 
   services.xserver.layout = "pl";
 
-  # Flatpak
-  services.flatpak.enable = true;
-  xdg.portal = {
-    enable = true;
-    extraPortals =
-      lib.mkIf (config.services.xserver.desktopManager.gnome.enable == false)
-        [ pkgs.xdg-desktop-portal-gtk ];
-    config.common.default = "*";
-  };
-
-
-  systemd.user.extraConfig = ''
-    DefaultEnvironment="PATH=/run/current-system/sw/bin"
-  '';
-
   # Fonts
   fonts.packages = with pkgs; [
     source-code-pro
@@ -152,7 +137,7 @@
     useUserPackages = true;
     backupFileExtension = "backup";
     users.wittano = {
-      home.stateVersion = "23.05";
+      home.stateVersion = "23.11";
       services.home-manager.autoUpgrade = {
         enable = true;
         frequency = "daily";

diff --git a/flake.lock b/flake.lock
diff --git a/home/pc/default.nix b/home/pc/default.nix
@@ -12,7 +12,7 @@ let
     thunderbird
     gnome.file-roller
     gnome.eog
-    #spotify
+    spotify
     evince
     xfce.thunar
     obsidian
@@ -29,7 +29,6 @@ let
     discord
 
     # Dev
-    vscodium
     figma-linux
   ];
 in

diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix
@@ -49,10 +49,6 @@
         sound.enable = true;
         grub.enable = true;
         wacom.enable = true;
-        wifi = {
-          enable = true;
-          enableTpLink = true;
-        };
         virtualization = {
           enable = true;
           enableDocker = true;

diff --git a/hosts/pc/networking.nix b/hosts/pc/networking.nix
@@ -1,4 +1,7 @@
 { ... }: {
+  systemd.network.wait-online.enable = false;
+  boot.initrd.systemd.network.wait-online.enable = false;
+
   networking = {
     useDHCP = false;
 

diff --git a/modules/dev/python.nix b/modules/dev/python.nix
@@ -1,7 +1,8 @@
 { config, pkgs, lib, home-manager, unstable, ... }:
 with lib;
 let cfg = config.modules.dev.pycharm;
-in {
+in
+{
   options = {
     modules.dev.pycharm = {
       enable = mkEnableOption ''
@@ -12,17 +13,12 @@ in {
 
   config = mkIf cfg.enable {
     home-manager.users.wittano = {
-      home = {
-        packages = with pkgs; [
-          virtualenv
-          pipenv
-          python311Full
-          jetbrains.pycharm-professional
-        ];
-        file.".ideavimrc".text = ''
-          set rnu nu
-        '';
-      };
+      home.packages = with pkgs; [
+        python3
+        pipenv
+        poetry
+        jetbrains.pycharm-professional
+      ];
 
       programs.fish.shellAliases = mkIf (config.modules.shell.fish.enable) {
         ppython = "cd $HOME/projects/own/python";

diff --git a/modules/hardware/wifi.nix b/modules/hardware/wifi.nix
@@ -17,8 +17,12 @@ in
     };
   };
 
-  config = {
-    networking.networkmanager.enable = true;
+  config = mkIf cfg.enable {
+    # TODO Fix problem with blocking playing spotify tracks
+    networking = {
+      networkmanager.enable = true;
+      wireless.enable = true;
+    };
 
     boot = mkIf cfg.enableTpLink {
       extraModulePackages = mkIf (!kernel.kernelAtLeast "5.18") [ pkgs.linuxKernel.packages."${kernelVersionPackage}".rtl8192eu ];