From e7791dfd1519f92144229424b1bd61f8a21277b4 Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 18 Dec 2023 14:43:57 +0100 Subject: [PATCH 1/2] update, alt --- home/alt.nix | 58 ++++++++++++++++++++++++++++++++++++++++ home/desktop/default.nix | 9 +++++++ home/firefox.nix | 4 +-- 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 home/alt.nix diff --git a/home/alt.nix b/home/alt.nix new file mode 100644 index 0000000..88c57dc --- /dev/null +++ b/home/alt.nix @@ -0,0 +1,58 @@ +{ config, pkgs, inputs, lib, ... }: + +{ + home.username = "alt"; + home.homeDirectory = "/home/alt"; + home.stateVersion = "22.11"; + + nixpkgs = { + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + }; + + programs.home-manager.enable = true; + + xdg.userDirs = { + enable = true; + createDirectories = true; + download = "${config.home.homeDirectory}/tmp"; + music = "${config.home.homeDirectory}/media/music"; + pictures = "${config.home.homeDirectory}/media/img"; + videos = "${config.home.homeDirectory}/media/vid"; + documents = "${config.home.homeDirectory}/misc"; + templates = "${config.xdg.dataHome}/templates"; + }; + + home.file.".npmrc".text = '' + prefix = ${config.xdg.dataHome}/npm/packages + ''; + + home.packages = with pkgs; [ + + # commandline + fzf + nnn + jq + progress + silver-searcher + tmux + wl-clipboard + + firefox + qbittorrent + vlc + + ]; + + imports = [ + ./desktop + ]; + + programs.nix-index = { + enable = true; + enableFishIntegration = true; + }; + +} diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 3c48b8a..425be0d 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -13,6 +13,15 @@ "run-or-raise@edvard.cz" ]; }; + "org/gnome/desktop/peripherals/touchpad" = { + speed = 0.5; + }; + "org/gnome/mutter" = { + dynamic-workspaces = true; + }; + "org/gnome/desktop/session" = { + idle-delay = 600; + }; }; xdg.configFile."run-or-raise/shortcuts.conf".source = ./run-or-raise.conf; } diff --git a/home/firefox.nix b/home/firefox.nix index 202d0d3..2bd91da 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -36,8 +36,8 @@ }; }; profiles = { - till = { - name = "till"; + ${config.home.username} = { + name = config.home.username; isDefault = true; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin From 7de0c6a38981fef446104b93cbb41f31d6777cc2 Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 18 Dec 2023 14:44:43 +0100 Subject: [PATCH 2/2] stuff --- alt/default.nix | 58 ----------------------------------- alt/desktop/default.nix | 18 ----------- alt/desktop/run-or-raise.conf | 42 ------------------------- flake.lock | 18 +++++------ flake.nix | 2 +- system/alt.nix | 4 +-- 6 files changed, 11 insertions(+), 131 deletions(-) delete mode 100644 alt/default.nix delete mode 100644 alt/desktop/default.nix delete mode 100644 alt/desktop/run-or-raise.conf diff --git a/alt/default.nix b/alt/default.nix deleted file mode 100644 index 88c57dc..0000000 --- a/alt/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, pkgs, inputs, lib, ... }: - -{ - home.username = "alt"; - home.homeDirectory = "/home/alt"; - home.stateVersion = "22.11"; - - nixpkgs = { - config = { - allowUnfree = true; - allowUnfreePredicate = (_: true); - }; - }; - - programs.home-manager.enable = true; - - xdg.userDirs = { - enable = true; - createDirectories = true; - download = "${config.home.homeDirectory}/tmp"; - music = "${config.home.homeDirectory}/media/music"; - pictures = "${config.home.homeDirectory}/media/img"; - videos = "${config.home.homeDirectory}/media/vid"; - documents = "${config.home.homeDirectory}/misc"; - templates = "${config.xdg.dataHome}/templates"; - }; - - home.file.".npmrc".text = '' - prefix = ${config.xdg.dataHome}/npm/packages - ''; - - home.packages = with pkgs; [ - - # commandline - fzf - nnn - jq - progress - silver-searcher - tmux - wl-clipboard - - firefox - qbittorrent - vlc - - ]; - - imports = [ - ./desktop - ]; - - programs.nix-index = { - enable = true; - enableFishIntegration = true; - }; - -} diff --git a/alt/desktop/default.nix b/alt/desktop/default.nix deleted file mode 100644 index 3c48b8a..0000000 --- a/alt/desktop/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: - -{ - home.pointerCursor = { - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 32; - }; - - dconf.settings = { - "org/gnome-shell" = { - enabled-extensions = [ - "run-or-raise@edvard.cz" - ]; - }; - }; - xdg.configFile."run-or-raise/shortcuts.conf".source = ./run-or-raise.conf; -} diff --git a/alt/desktop/run-or-raise.conf b/alt/desktop/run-or-raise.conf deleted file mode 100644 index 2361354..0000000 --- a/alt/desktop/run-or-raise.conf +++ /dev/null @@ -1,42 +0,0 @@ -# Here you list all the shortcuts. -# -# The shortcuts may be defined in two ways: -# -# 1. Run-or-raise form: shortcut,launch-command,[wm_class],[title] -# * wm_class and title are optional and case sensitive -# * if none is set, lowercased launch-command is compared with lowercased windows wm_classes and titles -# -# 2. Run only form: shortcut,calculate -# -# ================= -# Run or raise form -# ================= -# -# This line cycles any open gnome-terminal (matched by wm_class = Gnome-terminal on Ubuntu 17.10) OR if not found, launches new one. -# If you're using Arch, you may want to match by wm_class = gnome-terminal-server , just check yourself by Alt+F2/lg/Windows -t,gnome-terminal,gnome-terminal-server, -n,nautilus,, -f,firefox,, -return,foot,, -x,keepassxc,,, -q,qutebrowser,, - -# You may use regular expression in title or wm_class. -# Just put the regular expression between slashes. -# E.g. to jump to pidgin conversation window you may use this line -# (that means any windows of wm_class Pidgin, not containing the title Buddy List)" -# KP_1,pidgin,Pidgin,/^((?!Buddy List).)*$/ - -# Have the mail always at numpad-click. -# KP_2,chromium-browser --app=https://mail.google.com/mail/u/0/#inbox - -# ============= -# Run only form -# ============= -# -# This line will launch notify-send command. -# h,notify-send Hello world - -# Blank lines are allowed. Line starting with "#" means a comment. -# Now delete these shortcuts and put here yours. -# How to know wm_class? Alt+f2, lg, "windows" tab (at least on Ubuntu 17.10) diff --git a/flake.lock b/flake.lock index ea15eba..1ca9e2d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1702124454, - "narHash": "sha256-+lwBEFPxQ8VM3ht6qEcR92A/M9GF6mDtAwKgPI3YgXQ=", + "lastModified": 1702814335, + "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fa91c109b0dd12e680dd29010e262884f7b26186", + "rev": "e4dba0bd01956170667458be7b45f68170a63651", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701952659, - "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nur": { "locked": { - "lastModified": 1702154858, - "narHash": "sha256-jjLWEdor/ynwQfmKC6f7YW1rPcK6gHWoP4pxoRv3VSo=", + "lastModified": 1702902799, + "narHash": "sha256-KNTIeQ6gDVoX3QSW0tWgCVjvmJ3JO+FT8XwRxL9dZN0=", "owner": "nix-community", "repo": "nur", - "rev": "25f4052a47d6ef4ed1fccdd55bb94e57ea664432", + "rev": "4561fa27240f2b30aeb1bfdc27162a32b77b0b8d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 90c2585..08932c8 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay; extraSpecialArgs = { inherit inputs; }; modules = [ - ./alt + ./home/alt.nix ]; }; }; diff --git a/system/alt.nix b/system/alt.nix index 60c72e6..d26f2f1 100644 --- a/system/alt.nix +++ b/system/alt.nix @@ -2,14 +2,12 @@ { users.users.alt = { - isSystemUser = true; + isNormalUser = true; description = "Alt"; extraGroups = [ "networkmanager" ]; shell = pkgs.fish; - group = "alt"; - home = "/home/alt"; }; users.groups.alt = {}; }