repo: push unstaged

moni-dz · Aug 2, 2021 · 79fc7ed · 79fc7ed
1 parent 00dde82
commit 79fc7ed
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 59 deletions.
diff --git a/flake.nix b/flake.nix
@@ -14,13 +14,11 @@
     # Flake inputs
     agenix.url = "github:ryantm/agenix";
     emacs.url = "github:nix-community/emacs-overlay";
-    emacs-ng.url = "github:emacs-ng/emacs-ng";
     home.url = "github:nix-community/home-manager";
     manix.url = "github:mlvzk/manix";
     neovim.url = "github:neovim/neovim?dir=contrib";
     nixpkgs-f2k.url = "github:fortuneteller2k/nixpkgs-f2k";
     review.url = "github:Mic92/nixpkgs-review";
-    rust.url = "github:oxalica/rust-overlay";
 
     # Nixpkgs branches
     master.url = "github:nixos/nixpkgs/master";
@@ -106,7 +104,6 @@
 
         # Overlays provided by inputs
         emacs.overlay
-        rust.overlay
         nixpkgs-f2k.overlay
       ]
       # Overlays from ./overlays directory

diff --git a/hosts/superfluous/configuration.nix b/hosts/superfluous/configuration.nix
@@ -110,66 +110,60 @@ in
     supportedLocales = [ "en_US.UTF-8/UTF-8" ];
   };
 
-  environment =
-    let
-      iwdSettings.Settings.AutoConnect = true;
-      iwdConfigFile = (pkgs.formats.ini { }).generate "main.conf" iwdSettings;
-    in
-    {
-      /*
-        NOTE: This isn't found in https://search.nixos.org/options.
-
-        Here's the warning that came with it:
-
-        "Please note that NixOS assumes all over the place that shell to be Bash,
-        so override the default setting only if you know exactly what you're doing."
-      */
-      binsh = "${pkgs.zsh}/bin/zsh";
-      etc."iwd/main.conf".source = iwdConfigFile;
+  environment = {
+    /*
+      NOTE: This isn't found in https://search.nixos.org/options.
 
-      pathsToLink = [ "/share/zsh" ];
+      Here's the warning that came with it:
 
-      sessionVariables = with pkgs; {
-        # LD_PRELOAD = "/etc/nixos/config/ld-preload-xcreatewindow.so";
-        _JAVA_AWT_WM_NONREPARENTING = "1";
-      };
+      "Please note that NixOS assumes all over the place that shell to be Bash,
+      so override the default setting only if you know exactly what you're doing."
+    */
+    binsh = "${pkgs.zsh}/bin/zsh";
 
-      shells = with pkgs; [ zsh ];
+    pathsToLink = [ "/share/zsh" ];
 
-      # Font packages should go in fonts.fonts a few lines below this.
-      systemPackages = with pkgs; [
-        alsaTools
-        alsaUtils
-        brightnessctl
-        coreutils
-        curl
-        dash
-        fd
-        file
-        git
-        glxinfo
-        gnome3.nautilus
-        hikari
-        libva-utils
-        lm_sensors
-        man-pages
-        man-pages-posix
-        ntfs3g
-        pavucontrol
-        pciutils
-        psmisc
-        pulseaudio
-        ripgrep
-        subversion
-        util-linux
-        unrar
-        unzip
-        wget
-        xarchiver
-        zip
-      ];
+    sessionVariables = with pkgs; {
+      # LD_PRELOAD = "/etc/nixos/config/ld-preload-xcreatewindow.so";
+      _JAVA_AWT_WM_NONREPARENTING = "1";
     };
 
+    shells = with pkgs; [ zsh ];
+
+    # Font packages should go in fonts.fonts a few lines below this.
+    systemPackages = with pkgs; [
+      alsaTools
+      alsaUtils
+      brightnessctl
+      coreutils
+      curl
+      dash
+      fd
+      file
+      git
+      glxinfo
+      gnome3.nautilus
+      hikari
+      libva-utils
+      lm_sensors
+      man-pages
+      man-pages-posix
+      ntfs3g
+      pavucontrol
+      pciutils
+      psmisc
+      pulseaudio
+      ripgrep
+      subversion
+      util-linux
+      unrar
+      unzip
+      wget
+      xarchiver
+      zip
+    ];
+  };
+
   fonts = {
     fonts = with pkgs; [
       curie
@@ -235,7 +229,11 @@ in
     };
 
     useDHCP = false;
-    wireless.iwd.enable = true;
+
+    wireless.iwd = {
+      enable = true;
+      settings.Settings.AutoConnect = true;
+    };
   };
 
   powerManagement.cpuFreqGovernor = "schedutil";
@@ -359,6 +357,7 @@ in
       media-session.config = import ./config/pipewire/media-session.nix;
     };
 
+    thelounge.enable = true;
     usbmuxd.enable = true;
     upower.enable = true;
 

diff --git a/users/fortuneteller2k/config/neovim/coc-settings.nix b/users/fortuneteller2k/config/neovim/coc-settings.nix
@@ -7,4 +7,6 @@
     command = "${pkgs.rnix-lsp}/bin/rnix-lsp";
     filetypes = [ "nix" ];
   };
+
+  rust-analyzer.server.path = "rust-analyzer";
 }
diff --git a/users/fortuneteller2k/config/sway.nix b/users/fortuneteller2k/config/sway.nix
@@ -178,6 +178,7 @@ with theme.colors;
   }
 
   exec swayidle -w \
-      timeout 300 'swaylock -c ${bg} --font "Sarasa Gothic J" && swaymsg "output * dpms off"' \
+      timeout 300 'swaylock -c "${bg}" --font "Sarasa Gothic J"' \
+      timeout 310 'swaymsg "output * dpms off"' \
       resume 'swaymsg "output * dpms on"' \
 ''
diff --git a/users/fortuneteller2k/default.nix b/users/fortuneteller2k/default.nix
@@ -96,6 +96,7 @@ in
       nixpkgs-fmt
       nixpkgs-review
       notify-desktop
+      obsidian
       eww
       nvd
       pfetch
@@ -105,8 +106,10 @@ in
       speedtest-cli
       spotify-wrapped
       sublime4
+      teams
       torrential
       weechat
+      zoom
     ];
 
     sessionPath = [