From d0bac7240722c8b7e9cacdd56c52a17fb51dfbf9 Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Sat, 9 Oct 2021 11:08:14 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/common.nix | 1 + configs/gui.nix | 6 +++--- configs/secrets.nix.secret | Bin 1072 -> 1074 bytes configs/user-gui-applications.nix | 1 + configs/user-gui.nix | 24 +++++++++--------------- configs/user.nix | 2 -- machine/desktop.nix | 20 ++++++++++---------- packages/idasen.nix | 27 +++++++++++++++++++++++++++ 8 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 packages/idasen.nix diff --git a/configs/common.nix b/configs/common.nix index 1a3adca..e7f7822 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -77,6 +77,7 @@ in nix-tree nmap nodejs + parallel pciutils ruby tealdeer diff --git a/configs/gui.nix b/configs/gui.nix index ba2c678..54dcf17 100644 --- a/configs/gui.nix +++ b/configs/gui.nix @@ -120,10 +120,10 @@ displayManager = { lightdm = { enable = true; - background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.gnomeFilePath; + # background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.gnomeFilePath; greeters.gtk.theme = { - package = pkgs.mojave-gtk-theme; - name = "Mojave-dark"; + package = pkgs.pantheon.elementary-gtk-theme; + name = "elementary"; }; }; defaultSession = "xsession"; diff --git a/configs/secrets.nix.secret b/configs/secrets.nix.secret index 9268b2e52457fb3f941c443168767bab3e4126d7..2decefa5887549cbb5f934bef26fac78173dc7ce 100644 GIT binary patch literal 1074 zcmZo=;$b$E7Pz~&A*Y*BfT6oaUF!FxiR|725qhpB8Rje1*Z!7zBDDML`9C(p_eS?n8|1;M&-@DJb>*~>Ybx%bW@r#rP z|BBkM;?wUIp@KJF`&=KIFA?cmlV#3vqk@UGPILE?XE$num|yR|t(qm+;Q6z$>h_6k zGqocY@%2=&sJb5C(%rr8Et84gjvb}p{~l|d@by~VylG#)y1t@Sv-p)N&qT$aC&~go zdR-I^mDar)cshUGeAgvTpGp_=7aeri^_H=J*P1*0ynz}SZXNrT8P?4;w~e~Xx$FMB zgk^8JpIOE2uJ^4t>nRc2r`uSu>(|6!t;q1d6B<%pSiE@A(0@^~?AU@6uh>;y-cJsi z?mMsk$60Q#9VL$8Jp5G^mSRWrRS!*DFJ5c8(Qv{%&l7*0*-qc&4L6TJ?dJW>;zXqu zOWC{=G2h$|e6Mgges8bJv_}HJw)3(CtGj=;@=RuHJiaAcEi*`{tgLl(Yz`_fqH==ufwLjQd(<8EIVqjb;u$(Ktn8Q-L;KjCoCSj%;V zG5e1pb5YUG9G<5M$F?!^^z<@Llu4aizsWH0l;jKcL;pRLd-U#pI`m_4c4q$nS{vKc z+fvp6cPyPa{~wMk(U|UC>g3|7vFhT15UGG=PgoxpmF%1ET*CEKzdnZLk$lscz~0kU z)t*yl@SB~SqTlx|&UCxuynkr0%}UVdqJj?KYuE)2_b61fY)H}%i;o*QcU zG3c*SsGZo7Oty~9?N4kq!(9TNyw?(s`pNJt?A;0tPK!&5)~|cN#6A2n`PJOH#|`qW zr0Q)M(w6Lf6gu_W)yJ=Dw)3qo_>}gh|H-B6OYOJZ*|GSDo*nO z8y{v$EWO!ZzlHnXr`Ow6GrzFxVJe8W)RH^;RgJ4-`ROHUZ`SeTsd%lvcxv~RzoMp( z+k8zK_wUuY)oWK;vZZT<`o(oUyF%J#-oE&|@BVB$_w?` z+=0FEbDJlK_qrbH5R^D}>Z0tiTPM;!)jnK&we0-SXIoTMII{y)N+zdy{oxj`l5}8} w722&mUua68lY-z{L#w2p`a7o7+O2&1;cnmKh3od4K2w27Wuv+MEmpWh`Ic8hMZT2!-2OZIyXyZBD-xy;A9wys-#{?D@qTR*Qb zyS(;#?}o$ce?RO9?2h{Gar%DC^q`8#zfYW8`sr$E(}JZrb3=~K+aS!nCPrrSjGAvd z-PUC4-Ky@|D>Kil@BUGPV+{3ED^mUM&-K|m;Xng7*DII4^25d5T3ZYrTI?^4UR?by zhx?k<zCBj`?}(esv8En|-o# zyDG-_p2xiBi4mGa|mUHJI0ao;~w;-u|#$#V2C%Gx=Gvg>O%~^pdgk%gqh#9rpy3 zyD-~NBqkZ4X z{J+e!w*2~%3y)PTPik^Wmor9HFfg8;v*N(g1x6nhK4)KgduNpFa?|b0G-PuG4UX)d zSiLcpe+xeg*9;E7(;G66iRNq8nC=_)T}eE%@Sn`7x)8$LhuV z57#aWRq>fqGkvM?!aYZ>T?%hhdoeq<-$8vB-}hU`J>}dcHs?$}$g|3Gkw}5dIm?$v ziuRoATwXknVee^y7pFqPUH82eyE{jJUh!Gc)+^gAPOwEut;&4KKJ9yL%FKoDRNCF5fyTsLsFgfxP>7akHK~H`C4CxGUyQd$?%z?OlQr)0* zZ{cUd_YB=PQXR}y+plszGrjeEiLuTrfv1W+30h32velZOY}?MUhF^|zV)pUxPj{Z1 xt=hrAx__On>+@-cs(RwOfQzrnZ?CLh2Bp$0s!>x7+(MY diff --git a/configs/user-gui-applications.nix b/configs/user-gui-applications.nix index 5c2e513..60a5f00 100644 --- a/configs/user-gui-applications.nix +++ b/configs/user-gui-applications.nix @@ -42,6 +42,7 @@ in wine winetricks obs-studio + freecad ]; }; }; diff --git a/configs/user-gui.nix b/configs/user-gui.nix index e934c63..8c15347 100644 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -53,15 +53,15 @@ in size = 12; }; gtk3 = { - bookmarks = [ - "file:///home/alex/Downloads" - "file:///home/alex/Nextcloud" - "file:///mnt/second" - "smb://192.168.0.100/storage/" - "file:///home/alex/Workspace" - "file:///home/alex/3D%20Print" - "file:///home/alex/Sync" - ]; + # bookmarks = [ + # "file:///home/alex/Downloads" + # "file:///home/alex/Nextcloud" + # "file:///mnt/second" + # "smb://192.168.0.100/storage/" + # "file:///home/alex/Workspace" + # "file:///home/alex/3D%20Print" + # "file:///home/alex/Sync" + # ]; extraConfig = { gtk-application-prefer-dark-theme = 1; }; @@ -314,12 +314,6 @@ in dawnTime = "06:30-07:00"; }; - screen-locker = { - enable = true; - enableDetectSleep = true; - inactiveInterval = 30; - lockCmd = "light-locker-command -l"; - }; flameshot.enable = true; }; diff --git a/configs/user.nix b/configs/user.nix index 48c3364..f9da12c 100644 --- a/configs/user.nix +++ b/configs/user.nix @@ -22,8 +22,6 @@ environment.pathsToLink = [ "/share/zsh" ]; home-manager.users.alex = { pkgs, ... }: { - - home = { enableNixpkgsReleaseCheck = false; packages = with pkgs; [ diff --git a/machine/desktop.nix b/machine/desktop.nix index 7f1c4d4..30ca2e5 100644 --- a/machine/desktop.nix +++ b/machine/desktop.nix @@ -92,16 +92,16 @@ in enable = true; config = '' INTERVAL=10 - DEVPATH=hwmon3=devices/platform/it87.656 - DEVNAME=hwmon3=it8665 - FCTEMPS=hwmon3/pwm3=hwmon3/temp1_input hwmon3/pwm2=hwmon3/temp1_input hwmon3/pwm1=hwmon3/temp1_input - FCFANS=hwmon3/pwm3=hwmon3/fan2_input hwmon3/pwm2=hwmon3/fan1_input hwmon3/pwm1= - MINTEMP=hwmon3/pwm3=60 hwmon3/pwm2=60 hwmon3/pwm1=60 - MAXTEMP=hwmon3/pwm3=75 hwmon3/pwm2=75 hwmon3/pwm1=75 - MINSTART=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51 - MINSTOP=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51 - MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=51 hwmon3/pwm3=51 - MAXPWM=hwmon3/pwm3=127 hwmon3/pwm2=204 + DEVPATH=hwmon2=devices/platform/it87.656 + DEVNAME=hwmon2=it8665 + FCTEMPS=hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm2=hwmon2/temp1_input hwmon2/pwm1=hwmon2/temp1_input + FCFANS=hwmon2/pwm3=hwmon2/fan2_input hwmon2/pwm2=hwmon2/fan1_input hwmon2/pwm1= + MINTEMP=hwmon2/pwm3=60 hwmon2/pwm2=60 hwmon2/pwm1=60 + MAXTEMP=hwmon2/pwm3=75 hwmon2/pwm2=75 hwmon2/pwm1=75 + MINSTART=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 + MINSTOP=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 + MINPWM=hwmon2/pwm1=51 hwmon2/pwm2=51 hwmon2/pwm3=51 + MAXPWM=hwmon2/pwm3=127 hwmon2/pwm2=204 ''; }; diff --git a/packages/idasen.nix b/packages/idasen.nix new file mode 100644 index 0000000..4fa0804 --- /dev/null +++ b/packages/idasen.nix @@ -0,0 +1,27 @@ +with import {}; + +( let + idasen = pkgs.python3Packages.buildPythonPackage rec { + name = "idasen"; + version = "v0.7.1"; + + src = pkgs.fetchFromGitHub { + owner = "newAM"; + repo = "${name}"; + rev = "${version}"; + #sha256 = "1ibrwal80z27c2mh9hx85idmzilx6cpcmgc15z3lyz57bz0krigb"; + }; + + meta = { + homepage = "https://github.com/newAM/idasen"; + description = "This is a command line interface written in python to control the Idasen via bluetooth from a desktop computer."; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with maintainers; [ newAM ]; + }; + }; + + in pkgs.python3.buildEnv.override rec { + extraLibs = with pkgs.python3Packages; [ numpy toolz vpn-slice ]; + propagatedBuildInputs = with pkgs.python3Packages; [ setproctitle ]; + } +).env