From 1b27090a949c41993bc049256560c816be64c2e1 Mon Sep 17 00:00:00 2001 From: Geir Okkenhaug Jerstad Date: Mon, 26 Aug 2024 21:53:27 +0200 Subject: [PATCH 1/3] added du-dust to laptop && workstation --- laptop/#configuration.nix# | 189 +++++++++++++++++++++++++++++++++++++ laptop/.#configuration.nix | 1 + laptop/configuration.nix | 2 +- 3 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 laptop/#configuration.nix# create mode 120000 laptop/.#configuration.nix diff --git a/laptop/#configuration.nix# b/laptop/#configuration.nix# new file mode 100644 index 0000000..c742df1 --- /dev/null +++ b/laptop/#configuration.nix# @@ -0,0 +1,189 @@ +{ config, pkgs, ... }: +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ./zsh.nix + ./tuigreet.nix + ./sway.nix + ./kitty.nix + #./cosmic.nix + ./tty.nix + ./aliases.nix + ./fonts.nix + #./k8s.nix + ./tail.nix + ./podman.nix + #./incus.nix + #./libvirt.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + zramSwap = { + enable = true; + algorithm = "zstd"; + }; + + # Enable all unfree hardware support. + hardware.firmware = with pkgs; [ firmwareLinuxNonfree ]; + hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; + nixpkgs.config.allowUnfree = true; + services.fwupd.enable = true; + + services.fstrim.enable = true; + + # Networking + networking.networkmanager.enable = true; + networking.hostName = "idea"; + networking.nftables.enable = true; + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Oslo"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + # Enable the X11 windowing system. + services.xserver.enable = true; + services.xserver.videoDrivers = [ "amdgpu" ]; + + #programs.steam.enable = true; + #services.desktopManager.plasma6.enable = true; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "no"; + xkb.variant = ""; + }; + + # Configure console keymap + console = { + font = "Lat2-Terminus16"; + keyMap = "no"; + }; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nb_NO.utf8"; + LC_IDENTIFICATION = "nb_NO.utf8"; + LC_MEASUREMENT = "nb_NO.utf8"; + LC_MONETARY = "nb_NO.utf8"; + LC_NAME = "nb_NO.utf8"; + LC_NUMERIC = "nb_NO.utf8"; + LC_PAPER = "nb_NO.utf8"; + LC_TELEPHONE = "nb_NO.utf8"; + LC_TIME = "nb_NO.utf8"; + }; + + # Enable CUPS to print documents. + services.printing.enable = false; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + # Enable flakes and other experimental features + nix = { + extraOptions = "experimental-features = nix-command flakes"; + package = pkgs.nixFlakes; + }; + + services.emacs.enable = true; + + # User account. + nix.settings.trusted-users = [ "root" "geir" ]; + environment.localBinInPath = true; + users.users.geir = { + isNormalUser = true; + description = "Geir Okkenhaug Jerstad"; + extraGroups = [ "networkmanager" "wheel" ]; + shell = pkgs.zsh; + packages = with pkgs; [ + discord evince koodo-reader + # Browsers + firefox + # Monitoring tools + htop glances bottom fwupd + # shells & terminals + terminator kitty + starship + fzf + # Multiplexers + zellij + # Editors & command line text utils + hyfetch + mc + neovim + poppler_utils + emacs + emacsPackages.vterm + libvterm libtool + protonvpn-gui + ytfzf + nix-direnv + # + mpv + # Audio tools + ncpamixer + # blog + haunt + ]; + }; + + environment.systemPackages = with pkgs; [ + git hut unzip fastfetch + wget curl du-dust + inxi mlocate + tailscale bluez-tools + # Languages + zig + ## Scheme/lisp + guile chicken mitscheme scheme48 gerbil-unstable racket + go gotools golint + rustup + nodejs + # language servers + zls + gopls + luajitPackages.lua-lsp + nodePackages.bash-language-server + vimPlugins.cmp-nvim-lsp + ccls + vscode-langservers-extracted + gdb + # building software + glibc + stdenv + clang + qemu + cmake + gcc + bintools + gnutar + sccache + ncurses + # web dev + hugo + # git + gh + ]; + + # Open ports in the firewall. + networking.firewall.allowedTCPPorts = [ 22 ]; + networking.firewall.allowedUDPPorts = [ 22 ]; + networking.firewall.enable = true; + system.stateVersion = "22.11"; +} diff --git a/laptop/.#configuration.nix b/laptop/.#configuration.nix new file mode 120000 index 0000000..deab439 --- /dev/null +++ b/laptop/.#configuration.nix @@ -0,0 +1 @@ +geir@idea.1892:1724694921 \ No newline at end of file diff --git a/laptop/configuration.nix b/laptop/configuration.nix index 4612d5c..c742df1 100644 --- a/laptop/configuration.nix +++ b/laptop/configuration.nix @@ -145,7 +145,7 @@ environment.systemPackages = with pkgs; [ git hut unzip fastfetch - wget curl + wget curl du-dust inxi mlocate tailscale bluez-tools # Languages From 2e5c2f6f9a751480d1e4a03d8cb2180b179a5894 Mon Sep 17 00:00:00 2001 From: Geir Okkenhaug Jerstad Date: Mon, 26 Aug 2024 21:54:24 +0200 Subject: [PATCH 2/3] added du-dust to laptop && workstation --- laptop/#configuration.nix# | 189 ------------------------------------- laptop/.#configuration.nix | 1 - 2 files changed, 190 deletions(-) delete mode 100644 laptop/#configuration.nix# delete mode 120000 laptop/.#configuration.nix diff --git a/laptop/#configuration.nix# b/laptop/#configuration.nix# deleted file mode 100644 index c742df1..0000000 --- a/laptop/#configuration.nix# +++ /dev/null @@ -1,189 +0,0 @@ -{ config, pkgs, ... }: -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./zsh.nix - ./tuigreet.nix - ./sway.nix - ./kitty.nix - #./cosmic.nix - ./tty.nix - ./aliases.nix - ./fonts.nix - #./k8s.nix - ./tail.nix - ./podman.nix - #./incus.nix - #./libvirt.nix - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_latest; - zramSwap = { - enable = true; - algorithm = "zstd"; - }; - - # Enable all unfree hardware support. - hardware.firmware = with pkgs; [ firmwareLinuxNonfree ]; - hardware.enableAllFirmware = true; - hardware.enableRedistributableFirmware = true; - nixpkgs.config.allowUnfree = true; - services.fwupd.enable = true; - - services.fstrim.enable = true; - - # Networking - networking.networkmanager.enable = true; - networking.hostName = "idea"; - networking.nftables.enable = true; - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Set your time zone. - time.timeZone = "Europe/Oslo"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.videoDrivers = [ "amdgpu" ]; - - #programs.steam.enable = true; - #services.desktopManager.plasma6.enable = true; - - # Configure keymap in X11 - services.xserver = { - xkb.layout = "no"; - xkb.variant = ""; - }; - - # Configure console keymap - console = { - font = "Lat2-Terminus16"; - keyMap = "no"; - }; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nb_NO.utf8"; - LC_IDENTIFICATION = "nb_NO.utf8"; - LC_MEASUREMENT = "nb_NO.utf8"; - LC_MONETARY = "nb_NO.utf8"; - LC_NAME = "nb_NO.utf8"; - LC_NUMERIC = "nb_NO.utf8"; - LC_PAPER = "nb_NO.utf8"; - LC_TELEPHONE = "nb_NO.utf8"; - LC_TIME = "nb_NO.utf8"; - }; - - # Enable CUPS to print documents. - services.printing.enable = false; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Enable flakes and other experimental features - nix = { - extraOptions = "experimental-features = nix-command flakes"; - package = pkgs.nixFlakes; - }; - - services.emacs.enable = true; - - # User account. - nix.settings.trusted-users = [ "root" "geir" ]; - environment.localBinInPath = true; - users.users.geir = { - isNormalUser = true; - description = "Geir Okkenhaug Jerstad"; - extraGroups = [ "networkmanager" "wheel" ]; - shell = pkgs.zsh; - packages = with pkgs; [ - discord evince koodo-reader - # Browsers - firefox - # Monitoring tools - htop glances bottom fwupd - # shells & terminals - terminator kitty - starship - fzf - # Multiplexers - zellij - # Editors & command line text utils - hyfetch - mc - neovim - poppler_utils - emacs - emacsPackages.vterm - libvterm libtool - protonvpn-gui - ytfzf - nix-direnv - # - mpv - # Audio tools - ncpamixer - # blog - haunt - ]; - }; - - environment.systemPackages = with pkgs; [ - git hut unzip fastfetch - wget curl du-dust - inxi mlocate - tailscale bluez-tools - # Languages - zig - ## Scheme/lisp - guile chicken mitscheme scheme48 gerbil-unstable racket - go gotools golint - rustup - nodejs - # language servers - zls - gopls - luajitPackages.lua-lsp - nodePackages.bash-language-server - vimPlugins.cmp-nvim-lsp - ccls - vscode-langservers-extracted - gdb - # building software - glibc - stdenv - clang - qemu - cmake - gcc - bintools - gnutar - sccache - ncurses - # web dev - hugo - # git - gh - ]; - - # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 22 ]; - networking.firewall.allowedUDPPorts = [ 22 ]; - networking.firewall.enable = true; - system.stateVersion = "22.11"; -} diff --git a/laptop/.#configuration.nix b/laptop/.#configuration.nix deleted file mode 120000 index deab439..0000000 --- a/laptop/.#configuration.nix +++ /dev/null @@ -1 +0,0 @@ -geir@idea.1892:1724694921 \ No newline at end of file From f27a150cd6e74326cac59da29768dc0d7c1136ce Mon Sep 17 00:00:00 2001 From: Geir Okkenhaug Jerstad Date: Mon, 26 Aug 2024 21:54:39 +0200 Subject: [PATCH 3/3] added du-dust to laptop && workstation --- workstation/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/workstation/configuration.nix b/workstation/configuration.nix index 44ebd8b..577f529 100644 --- a/workstation/configuration.nix +++ b/workstation/configuration.nix @@ -148,6 +148,7 @@ wayland xdg-utils nix-direnv + du-dust # Sway swaylock swayidle swaybg waybar fuzzel gammastep mako neovim emacs