add steam & nvim

flake.nix

@@ -14,6 +14,7 @@
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
       pkgsUnstable = nixpkgs-unstable.legacyPackages.${system};
+      nixvim.url = "github:azuwis/lazyvim-nixvim";
     in {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
       nixosConfigurations.dn-nix = nixpkgs.lib.nixosSystem {

home/config/hypr/bind.conf

@@ -12,6 +12,9 @@ bind = $mainMod, S, togglesplit, # dwindle
 bind = CTRL&$mainMod&SHIFT, L, exec, swaylock
 bind = $mainMod SHIFT, s, exec, hyprshot -m region --clipboard-only
 
+bind = $mainMod, F, exec, firefox 
+bind = $mainMod, C, exec, code 
+
 bind = $mainMod, h, movefocus, l
 bind = $mainMod, l, movefocus, r
 bind = $mainMod, k, movefocus, u
@@ -49,7 +52,6 @@ bind = $mainMod SHIFT, h, movewindow, l
 bind = $mainMod SHIFT, k, movewindow, u
 bind = $mainMod SHIFT, j, movewindow, d
 
-bind = $mainMod, f, exec, firefox 
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow

home/config/hypr/exec.conf

@@ -7,6 +7,7 @@ exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = waybar -c ~/.config/waybar/config -s ~/.config/waybar/style.css
 exec-once = hyprpaper
 exec-once = swayidle -w
+exec-once = sway-audio-idle-inhibit
 exec-once = nwg-look -a
 exec-once = [silent] fcitx5 -d -r &
 exec-once = [silent] fcitx5-remote -r &

home/config/nvim/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

home/config/nvim/README.md

@@ -0,0 +1,4 @@
+# 💤 LazyVim
+
+A starter template for [LazyVim](https://github.com/LazyVim/LazyVim).
+Refer to the [documentation](https://lazyvim.github.io/installation) to get started.

home/config/nvim/init.lua

@@ -1 +1,2 @@
-require("config/lazy");
+-- bootstrap lazy.nvim, LazyVim and your plugins
+require("config.lazy")

home/config/nvim/lua/config/lazy.lua

@@ -24,6 +24,7 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.lang.docker" },
     { import = "lazyvim.plugins.extras.lang.git" },
     { import = "lazyvim.plugins.extras.lang.json" },
+    { import = "lazyvim.plugins.extras.lang.nix" },
     { import = "lazyvim.plugins.extras.lang.markdown" },
     { import = "lazyvim.plugins.extras.lang.nushell" },
     { import = "lazyvim.plugins.extras.lang.omnisharp" },
@@ -46,14 +47,7 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.util.project" },
     { import = "lazyvim.plugins.extras.vscode" },
     -- import/override with your plugins
-    { import = "plugins", {
-      rocks = {enabled = false},
-      dev = {
-          path = "~/.local/share/nvim/nix",
-        fallback = false,
-        }
-      }
-    },
+    { import = "plugins" },
   },
   defaults = {
     -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.

home/config/nvim/lua/plugins/image.lua

@@ -0,0 +1,18 @@
+return {
+  {
+    "3rd/image.nvim",
+    opts = {
+      backend = "kitty",
+      processor = "magick_rock",
+      integrations = {
+        markdown = {
+          enabled = true,
+          clear_in_insert_mode = false,
+          download_remote_images = true,
+          only_render_image_at_cursor = false,
+          floating_windows = false,
+        },
+      },
+    },
+  },
+}

home/config/nvim/lua/plugins/treesitter.lua

@@ -1,23 +0,0 @@
-return {
-    'nvim-treesitter/nvim-treesitter',
-    event = { "BufReadPost", "BufNewFile" },
-    main = "nvim-treesitter.configs",
-    dev = true,
-    opts = {
-        highlight = {
-            -- `false` will disable the whole extension
-            enable = true,
-            additional_vim_regex_highlighting = false,
-        },
-        incremental_selection = {
-            enable = true,
-            keymaps = {
-                init_selection = "<CR>",
-                node_incremental = "<CR>",
-                scope_incremental = "<S-CR>",
-                node_decremental = "<BS>",
-            },
-        },
-    }
-
-}

home/config/nvim/stylua.toml

@@ -1,4 +1,3 @@
 indent_type = "Spaces"
 indent_width = 2
-column_width = 120
-
+column_width = 120

home/config/swayidle/config

@@ -1,3 +1,4 @@
-timeout 300 'swaylock'
+timeout 300 'if pgrep swaylock; then hyprctl dispatch dpms off; fi'
+resume 'hyprctl dispatch dpms on'
 timeout 420 'systemctl suspend'
 before-sleep 'swaylock'

home/user/config.nix

@@ -1,7 +1,10 @@
 let configDir = ../config;
 in {
   home.file = {
-    ".config/nvim".source = "${configDir}/nvim";
+    ".config/nvim" = {
+      source = "${configDir}/nvim";
+      recursive = true;
+    };
     ".config/wallpapers".source = "${configDir}/wallpapers";
     ".config/kitty".source = "${configDir}/kitty";
     ".config/neofetch".source = "${configDir}/neofetch";

home/user/environment.nix

@@ -28,6 +28,7 @@
     #XDG_BIN_HOME = "\${HOME}/.local/bin";
     XDG_DATA_HOME = "\${HOME}/.local/share";
     GTK_IM_MODULE = "";
+    XDG_DATA_DIRS = "\${XDG_DATA_DIRS}:/usr/share:/var/lib/flatpak/exports/share:\${HOME}/.local/share/flatpak/exports/share";
 
     # GPU
     LIBVA_DRIVER_NAME  = "nvidia";

home/user/packages.nix

@@ -5,17 +5,17 @@
     pkgs.vscode
     pkgs.discord
     pkgs.firefox
-  
+
     # Dev stuff
     pkgs.gcc
     pkgs.go
-    pkgs.lua
     pkgs.nodePackages.pnpm
     (pkgs.python3.withPackages
       (python-pkgs: [ python-pkgs.pip python-pkgs.requests ]))
     pkgs.rustup
     pkgs.pkgsCross.mingwW64.stdenv.cc
     pkgs.pkgsCross.mingwW64.windows.pthreads
+    pkgs.postman
 
     # Work stuff
     pkgs.libreoffice-qt

home/user/programs.nix

@@ -1,4 +1,13 @@
 { inputs, pkgs, ... }:
 
 {
+	programs = {
+		neovim = {
+			enable = true;
+			withNodeJs = true;
+			extraLuaPackages = ps: [ ps.magick ];
+			extraPackages = [ pkgs.imagemagick ];
+		};
+	};
+
 }

home/user/programs/nvim/default.nix

@@ -1,75 +0,0 @@
-{ pkgs, ... }:
-let
-
-  treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
-    p.bash
-    p.comment
-    p.css
-    p.dockerfile
-    p.fish
-    p.gitattributes
-    p.gitignore
-    p.go
-    p.gomod
-    p.gowork
-    p.hcl
-    p.javascript
-    p.jq
-    p.json5
-    p.json
-    p.lua
-    p.make
-    p.markdown
-    p.nix
-    p.python
-    p.rust
-    p.toml
-    p.typescript
-    p.vue
-    p.yaml
-  ]));
-
-  treesitter-parsers = pkgs.symlinkJoin {
-    name = "treesitter-parsers";
-    paths = treesitterWithGrammars.dependencies;
-  };
-in
-{
-  home.packages = with pkgs; [
-    ripgrep
-    fd
-    lua-language-server
-    rust-analyzer-unwrapped
-    black
-    gh
-  ];
-
-  programs.neovim = {
-    enable = true;
-    package = pkgs.neovim;
-    vimAlias = true;
-    coc.enable = false;
-    withNodeJs = true;
-
-    plugins = [
-       treesitterWithGrammars
-    ];
-  };
-
-  home.file."./.config/nvim/" = {
-    source = ../../../config/nvim;
-    recursive = true;
-  };
-
-  home.file."./.config/nvim/init.lua".text = ''
-    require("config.lazy")
-    vim.opt.runtimepath:append("${treesitter-parsers}")
-  '';
-
-  # Treesitter is configured as a locally developed module in lazy.nvim
-  # we hardcode a symlink here so that we can refer to it in our lazy config
-  home.file."./.local/share/nvim/nix/nvim-treesitter/" = {
-    recursive = true;
-    source = treesitterWithGrammars;
-  };
-}

home/user/programs/nvim/fx_loader.sh

@@ -1,10 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p patchelf
-
-# Fixes linking for NixOS
-# ./fx_loader.sh ~/.local/share/nvim/mason/packages/rust-analyzer/rust-analyzer
-for binary in ${@}; do
-  patchelf \
-    --set-interpreter "$(cat ${NIX_CC}/nix-support/dynamic-linker)" \
-    "${binary}"
-done

system/modules/hyprland.nix

@@ -16,6 +16,7 @@
     qt5.qtwayland
     qt6.qtwayland
     swayidle
+    sway-audio-idle-inhibit # Prevent idle when playing audio
     swaylock-effects
     wlogout
     wl-clipboard

system/modules/networking.nix

@@ -5,6 +5,10 @@
     hostName = "dn-nix";
     networkmanager.enable = true;
     enableIPv6 = false;
-    firewall.enable = false;
+    firewall = { 
+      enable = true;
+      allowedTCPPorts = [ 22 ];
+      allowedUDPPorts = [ 51820 ];
+    };
   };
 }

system/modules/packages.nix

@@ -10,8 +10,10 @@
     btop
     eza
     fzf
+    ranger # Terminal file manager
     neofetch
     ripgrep
+    tree
     tldr # Alternative for man
     wget
     unzip
@@ -33,9 +35,19 @@
     openssl
     openssl.dev
     pkg-config # Include Lib
+    nodejs
+    yarn-berry
+    dotnetCorePackages.sdk_8_0_3xx
+    dotnetCorePackages.dotnet_9.sdk
+    dotnetCorePackages.dotnet_9.runtime
+    dotnetCorePackages.dotnet_9.aspnetcore
+    rustup
 
     # Editor
     neovim
+    lua51Packages.lua
+    luajitPackages.magick # neovim
+    vimPlugins.neomake
 
     # Misc
     xfce.thunar # File manager
@@ -48,6 +60,14 @@
     zoxide # Dir jumper
     starship # Shell theme
     carapace # Autocomplete
+
+    # USB auto mount
+    usbutils
+    udiskie
+    udisks
+
+    # Media
+    vlc
   ];
 }
 

system/modules/programs.nix

@@ -1,7 +1,6 @@
-{ config, pkgs, ... }:
+{ inputs, config, pkgs, ... }:
 
 {
-
   xdg.portal = {
     enable = true;
     wlr.enable = false;
@@ -13,9 +12,12 @@
   programs = {
     steam = {
       enable = true;
+      extest.enable = true;
       remotePlay.openFirewall = true;
       dedicatedServer.openFirewall = true;
       localNetworkGameTransfers.openFirewall = true;
+      fontPackages = with pkgs; [ wqy_zenhei noto-fonts-cjk-sans noto-fonts-cjk-serif ];
+      extraPackages = with pkgs; [ wqy_zenhei noto-fonts-cjk-sans noto-fonts-cjk-serif ];
     };
 
     hyprland = {

system/modules/services.nix

@@ -1,10 +1,27 @@
 { config, pkgs, ... }:
 
 {
+  systemd.services.flatpak-repo = {
+    wantedBy = [ "multi-user.target" ];
+    path = [ pkgs.flatpak ];
+    script = ''
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    '';
+  };
+
   services = {
     dbus.enable = true;
     picom.enable = true;
-    openssh.enable = true;
+    openssh = { 
+      enable = true; 
+      ports = [ 22 ];
+      settings = {
+        PasswordAuthentication = false;
+	AllowUsers = [ "danny" ];
+	UseDns = true;
+	PermitRootLogin =  "no";
+      };
+    };
 
     xserver = {
       enable = true;
@@ -15,5 +32,12 @@
       sddm.enable = true;
       sddm.theme = "${import ./sddm-theme.nix { inherit pkgs; }}";
     };
+
+    # USB auto mount
+    gvfs.enable = true;
+    udisks2.enable = true;
+    devmon.enable = true;
+
+    flatpak.enable = true;
   };
 }